Merge branch 'main' into release-preview-private-5g-core

Author: v-alje

.openpublishing.publish.config.json

@@ -884,6 +884,7 @@
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
     "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
-    "articles/mysql/.openpublishing.redirection.mysql.json"
+    "articles/mysql/.openpublishing.redirection.mysql.json",
+    "articles/container-apps/.openpublishing.redirection.container-apps.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -800,6 +800,11 @@
             "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/o365-external-user.md",
+            "redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-current-preview-limitations.md",
             "redirect_url": "/azure/active-directory/active-directory-b2b-current-limitations",

.openpublishing.redirection.azure-monitor.json

@@ -19,6 +19,11 @@
             "source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
             "redirect_url": "/azure/service-bus-messaging/service-bus-insights",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.defender-for-iot.json

@@ -1,10 +1,5 @@
 {
     "redirections": [
-        {
-            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
-            "redirect_url": "/azure/sentinel/iot-solution",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
             "redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -30,7 +25,17 @@
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
         },
-	{
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
+            "redirect_document_id": false
+        },
+	    {
             "source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
@@ -230,11 +235,6 @@
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -564,6 +564,29 @@
             "source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
             "redirect_url": "/azure/defender-for-iot/organizations",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
+            "redirect_document_id": false
         }
     ]
-}
+}
+
+
+

.openpublishing.redirection.json

@@ -15901,8 +15901,13 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-developer-lab.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-developer-lab",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-developer-lab.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-dev-ops.md",
@@ -16036,13 +16041,23 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-test-env.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-test-env",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-training-lab.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-training-lab",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-test-env.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-training-lab.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-troubleshoot-apply-artifacts.md",
@@ -19815,9 +19830,9 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-app-service.md",
-      "redirect_url": "/azure/machine-learning/how-to-deploy-app-service",
-      "redirect_document_id": true
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-app-service.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-managed-online-endpoints",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-azure-container-instance.md",
@@ -19844,6 +19859,11 @@
       "redirect_url": "/azure/machine-learning/how-to-deploy-and-where",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/machine-learning/how-to-homomorphic-encryption-seal.md",
+      "redirect_url": "/azure/machine-learning/",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/machine-learning/service/concept-accelerate-with-fpgas.md",
       "redirect_url": "/azure/machine-learning/how-to-deploy-fpga-web-service",
@@ -19855,9 +19875,14 @@
       "redirect_document_id": true
     },
     {
-      "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-functions.md",
-      "redirect_url": "/azure/machine-learning/how-to-deploy-functions",
-      "redirect_document_id": true
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-functions.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-managed-online-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-no-code-deployment.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-mlflow-models-online-endpoints",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/service/concept-accelerate-inferencing-with-gpus.md",
@@ -22629,6 +22654,11 @@
       "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-intro.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
     {
       "source_path_from_root": "/articles/scheduler/scheduler-advanced-complexity.md",
       "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
@@ -39464,11 +39494,6 @@
       "redirect_url": "/azure/azure-monitor/agents/data-sources-windows-events",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/azure-monitor/platform/data-collection-rule-overview.md",
-      "redirect_url": "/azure/azure-monitor/agents/data-collection-rule-overview",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/azure-monitor/platform/data-sources.md",
       "redirect_url": "/azure/azure-monitor/agents/data-sources",

.openpublishing.redirection.media-services.json

@@ -629,6 +629,11 @@
             "source_path_from_root": "/articles/media-services/latest/asset-create-asset-upload-portal-quickstart.md",
             "redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",
             "redirect_document_id": true
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/architecture-design-multi-drm-system.md",
+            "redirect_url": "/azure/media-services/latest/drm-content-protection-concept",
+            "redirect_document_id": true
           },     
         {
             "source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Thank you for taking the time to contribute to the Microsoft Azure documentation.
 
-This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
+This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
 
 ## Code of Conduct
 
@@ -25,4 +25,4 @@ Follow the guidance for [Quick edits to existing documents](/contribute/#quick-e
 
 ### Pull Request
 
-Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
+Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

articles/active-directory-b2c/customize-ui-with-html.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 10/14/2021
+ms.date: 02/23/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -55,13 +55,15 @@ Instead of creating your custom page content from scratch, you can customize Azu
 
 The following table lists the default page content provided by Azure AD B2C. Download the files and use them as a starting point for creating your own custom pages.
 
-| Default page | Description | Content definition ID<br/>(custom policy only) |
+| Page | Description | Templates |
 |:-----------------------|:--------|-------------|
-| [exception.html](https://login.microsoftonline.com/static/tenant/default/exception.cshtml) | **Error page**. This page is displayed when an exception or an error is encountered. | *api.error* |
-| [selfasserted.html](https://login.microsoftonline.com/static/tenant/default/selfAsserted.cshtml) |  **Self-Asserted page**. Use this file as a custom page content for a social account sign-up page, a local account sign-up page, a local account sign-in page, password reset, and more. The form can contain various input controls, such as: a text input box, a password entry box, a radio button, single-select drop-down boxes, and multi-select check boxes. | *api.localaccountsignin*, *api.localaccountsignup*, *api.localaccountpasswordreset*, *api.selfasserted* |
-| [multifactor-1.0.0.html](https://login.microsoftonline.com/static/tenant/default/multifactor-1.0.0.cshtml) | **Multi-factor authentication page**. On this page, users can verify their phone numbers (by using text or voice) during sign-up or sign-in. | *api.phonefactor* |
-| [updateprofile.html](https://login.microsoftonline.com/static/tenant/default/updateProfile.cshtml) | **Profile update page**. This page contains a form that users can access to update their profile. This page is similar to the social account sign-up page, except for the password entry fields. | *api.selfasserted.profileupdate* |
-| [unified.html](https://login.microsoftonline.com/static/tenant/default/unified.cshtml) | **Unified sign-up or sign-in page**. This page handles the user sign-up and sign-in process. Users can use enterprise identity providers, social identity providers such as Facebook or Google+, or local accounts. | *api.signuporsignin* |
+| Unified sign-up or sign-in | This page handles the user sign-up and sign-in process. Users can use enterprise identity providers, social identity providers such as Facebook, Microsoft account, or local accounts. | [Classic](https://login.microsoftonline.com/static/tenant/default/unified.cshtml), [Ocean Blue](https://login.microsoftonline.com/static/tenant/templates/AzureBlue/unified.cshtml), and [Slate Gray](https://login.microsoftonline.com/static/tenant/templates/MSA/unified.cshtml). |
+| Sign-in (only)| The sign-in page is also known as the *Identity provider selection*. It handles the user sign-in with local account, or federated identity providers. Use this page to allow sign-in without the ability to sign-up. For example before user can edit their profile. | [Classic](https://login.microsoftonline.com/static/tenant/default/idpSelector.cshtml), [Ocean Blue](https://login.microsoftonline.com/static/tenant/templates/AzureBlue/idpSelector.cshtml), and [Slate Gray](https://login.microsoftonline.com/static/tenant/templates/MSA/idpSelector.cshtml).
+| Self-Asserted | Most interactions in Azure AD B2C where the user is expected to provide input are self-asserted. For example, a sign-up page, sign-in page, or password reset page. Use this template as a custom page content for a social account sign-up page, a local account sign-up page, a local account sign-in page, password reset, edit profile, block page and more. The self-asserted page can contain various input controls, such as: a text input box, a password entry box, a radio button, single-select drop-down boxes, and multi-select check boxes. | [Classic](https://login.microsoftonline.com/static/tenant/default/selfAsserted.cshtml), [Ocean Blue](https://login.microsoftonline.com/static/tenant/templates/AzureBlue/selfAsserted.cshtml), and [Slate Gray](https://login.microsoftonline.com/static/tenant/templates/MSA/selfAsserted.cshtml).  |
+|  Multi-factor authentication |  On this page, users can verify their phone numbers (by using text or voice) during sign-up or sign-in. | [Classic](https://login.microsoftonline.com/static/tenant/default/multifactor-1.0.0.cshtml), [Ocean Blue](https://login.microsoftonline.com/static/tenant/templates/AzureBlue/multifactor-1.0.0.cshtml), and [Slate Gray](https://login.microsoftonline.com/static/tenant/templates/MSA/multifactor-1.0.0.cshtml). |
+| Error | This page is displayed when an exception or an error is encountered. | [Classic](https://login.microsoftonline.com/static/tenant/default/exception.cshtml), [Ocean Blue](https://login.microsoftonline.com/static/tenant/templates/AzureBlue/exception.cshtml), and [Slate Gray](https://login.microsoftonline.com/static/tenant/templates/MSA/exception.cshtml). |
+
+
 
 ## Hosting the page content
 
@@ -89,7 +91,7 @@ When using your own HTML and CSS files to customize the UI, host your UI content
 
 You localize your HTML content by enabling [language customization](language-customization.md) in your Azure AD B2C tenant. Enabling this feature allows Azure AD B2C to set the HTML page language attribute and pass the OpenID Connect parameter `ui_locales` to your endpoint.
 
-#### Single-template approach
+### Single-template approach
 
 During page load, Azure AD B2C sets the HTML page language attribute with the current language. For example, `<html lang="en">`. To render different styles per the current language, use the CSS `:lang` selector along with your CSS definition.
 
@@ -223,6 +225,7 @@ To host your HTML content in Blob storage, perform the following steps:
 1. **Redundancy** can remain **Geo-redundant storage (GRS)**
 1. Select **Review + create** and wait a few seconds for Azure AD to run a validation. 
 1. Select **Create** to create the storage account. After the deployment is completed, the storage account page opens automatically or select **Go to resource**.
+
 #### 2.1 Create a container
 
 To create a public container in Blob storage, perform the following steps:
@@ -445,4 +448,4 @@ To use [company branding](customize-ui.md#configure-company-branding) assets in
 
 ## Next steps
 
-Learn how to enable [client-side JavaScript code](javascript-and-page-layout.md).
+Learn how to enable [client-side JavaScript code](javascript-and-page-layout.md).

articles/active-directory-b2c/partner-dynamics-365-fraud-protection.md

@@ -168,7 +168,7 @@ In the provided [custom policies](https://github.com/azure-ad-b2c/partner-integr
 
 For additional information, review the following articles:
 
-- [Microsoft DFP samples](https://github.com/Microsoft/Dynamics-365-Fraud-Protection-Samples)
+- [Microsoft DFP samples](https://github.com/azure-ad-b2c/partner-integrations/tree/master/samples/Dynamics-Fraud-Protection)
 
 - [Custom policies in Azure AD B2C](./custom-policy-overview.md)