fixed merge conflicts

Author: stevemunk

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

@@ -804,6 +804,11 @@
             "source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds-servers.md",
             "redirect_url": "/azure/defender-for-cloud/support-matrix-defender-for-servers",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/faq-azure-monitor-logs.yml",
+            "redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
+            "redirect_document_id": true
         }
     ]
 }

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

@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-device-notifications.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-work-with-the-sensor-device-map#manage-device-notifications-from-an-ot-sensor-device-map",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-per-zone.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-work-with-the-sensor-device-map#view-a-device-map-for-a-specific-zone",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/resources-training-sessions.md",
             "redirect_url": "https://techcommunity.microsoft.com/t5/microsoft-defender-for-iot-blog/microsoft-defender-for-iot-ninja-training/ba-p/2428899",

.openpublishing.redirection.healthcare-apis.json

@@ -661,6 +661,10 @@
           "redirect_url": "/azure/healthcare-apis/iot/device-messages-through-iot-hub",
           "redirect_document_id": false
       },
+      {   "source_path_from_root": "/articles/healthcare-apis/iot/how-to-create-mappings-copies.md",
+          "redirect_url": "/azure/healthcare-apis/iot/how-to-use-mapping-debugger",
+          "redirect_document_id": false
+      },
       {   "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
           "redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
           "redirect_document_id": false

.openpublishing.redirection.json

@@ -7784,15 +7784,25 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/azure-maps/mobility-service-data-structure.md ",
+            "source_path_from_root": "/articles/azure-maps/mobility-service-data-structure.md",
             "redirect_url": "/azure/azure-maps",
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/azure-maps/power-bi-visual-getting-started.md ",
+            "source_path_from_root": "/articles/azure-maps/power-bi-visual-getting-started.md",
             "redirect_url": "/azure/azure-maps/power-bi-visual-get-started",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-maps/tutorial-creator-wfs.md",
+            "redirect_url": "/azure/azure-maps/how-to-creator-wfs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-maps/tutorial-creator-feature-stateset.md",
+            "redirect_url": "/azure/azure-maps/how-to-creator-feature-stateset",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-portal/resource-group-portal-linked-resources.md",
             "redirect_url": "/azure/azure-portal/azure-portal-dashboards",

.openpublishing.redirection.virtual-desktop.json

@@ -134,6 +134,41 @@
             "source_path_from_root": "/articles/virtual-desktop/powershell-module.md",
             "redirect_url": "/azure/virtual-desktop/cli-powershell",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/deploy-azure-ad-joined-vm.md",
+            "redirect_url": "/azure/virtual-desktop/azure-ad-joined-session-hosts",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/configure-vm-gpu.md",
+            "redirect_url": "/azure/virtual-desktop/enable-gpu-acceleration",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-validation-host-pool.md",
+            "redirect_url": "/azure/virtual-desktop/configure-validation-environment",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/expand-existing-host-pool.md",
+            "redirect_url": "/azure/virtual-desktop/add-session-hosts-host-pool",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-host-pools-azure-marketplace.md",
+            "redirect_url": "/azure/virtual-desktop/create-host-pool",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-host-pools-powershell.md",
+            "redirect_url": "/azure/virtual-desktop/create-host-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/deploy-windows-server-virtual-machine.md",
+            "redirect_url": "/azure/virtual-desktop/add-session-hosts-host-pool",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 03/01/2023
+ms.date: 03/06/2023
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: reference
@@ -30,6 +30,20 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 
 - [Migrate applications using header-based authentication to Azure Active Directory B2C with Grit's app proxy](partner-grit-app-proxy.md)
 - [Configure Grit's biometric authentication with Azure Active Directory B2C](partner-grit-authentication.md)
+- [Create and run your own custom policies in Azure Active Directory B2C](custom-policies-series-overview.md)
+- [Write your first Azure Active Directory B2C custom policy - Hello World!](custom-policies-series-hello-world.md)
+- [Collect and manipulate user inputs by using Azure AD B2C custom policy](custom-policies-series-collect-user-input.md)
+- [Validate user inputs by using Azure Active Directory B2C custom policy](custom-policies-series-validate-user-input.md)
+- [Create branching in user journey by using Azure Active Directory B2C custom policy](custom-policies-series-branch-user-journey.md)
+- [Validate custom policy files by using TrustFrameworkPolicy schema](custom-policies-series-install-xml-extensions.md)
+- [Call a REST API by using Azure Active Directory B2C custom policy](custom-policies-series-call-rest-api.md)
+- [Create and read a user account by using Azure Active Directory B2C custom policy](custom-policies-series-store-user.md)
+- [Set up a sign-up and sign-in flow by using Azure Active Directory B2C custom policy](custom-policies-series-sign-up-or-sign-in.md)
+- [Set up a sign-up and sign-in flow with a social account by using Azure Active Directory B2C custom policy](custom-policies-series-sign-up-or-sign-in-federation.md)
+- [Manage administrator accounts in Azure Active Directory B2C](tenant-management-manage-administrator.md)
+- [Manage emergency access accounts in Azure Active Directory B2C](tenant-management-emergency-access-account.md)
+- [Review tenant creation permission in Azure Active Directory B2C](tenant-management-check-tenant-creation-permission.md)
+- [Find tenant name and tenant ID in Azure Active Directory B2C](tenant-management-read-tenant-name.md)
 
 ### Updated articles
 

articles/active-directory-domain-services/password-policy.md

@@ -10,13 +10,13 @@ ms.service: active-directory
 ms.subservice: domain-services
 ms.workload: identity
 ms.topic: how-to
-ms.date: 01/29/2023
+ms.date: 03/06/2023
 ms.author: justinha
 
 ---
 # Password and account lockout policies on Azure Active Directory Domain Services managed domains
 
-To manage user security in Azure Active Directory Domain Services (Azure AD DS), you can define fine-grained password policies that control account lockout settings or minimum password length and complexity. A default fine grained password policy is created and applied to all users in an Azure AD DS managed domain. To provide granular control and meet specific business or compliance needs, additional policies can be created and applied to specific groups of users.
+To manage user security in Azure Active Directory Domain Services (Azure AD DS), you can define fine-grained password policies that control account lockout settings or minimum password length and complexity. A default fine grained password policy is created and applied to all users in an Azure AD DS managed domain. To provide granular control and meet specific business or compliance needs, additional policies can be created and applied to specific users or groups.
 
 This article shows you how to create and configure a fine-grained password policy in Azure AD DS using the Active Directory Administrative Center.
 
@@ -110,15 +110,15 @@ To create a custom password policy, you use the Active Directory Administrative
 
     ![Select the users and groups to apply the password policy to](./media/password-policy/fgpp-applies-to.png)
 
-1. Password policies can only be applied to groups. In the **Locations** dialog, expand the domain name, such as *aaddscontoso.com*, then select an OU, such as **AADDC Users**. If you have a custom OU that contains a group of users you wish to apply, select that OU.
+1. In the **Locations** dialog, expand the domain name, such as *aaddscontoso.com*, then select an OU, such as **AADDC Users**. If you have a custom OU that contains a group of users you wish to apply, select that OU.
 
     ![Select the OU that the group belongs to](./media/password-policy/fgpp-container.png)
 
-1. Type the name of the group you wish to apply the policy to, then select **Check Names** to validate that the group exists.
+1. Type the name of the user or group you wish to apply the policy to. Select **Check Names** to validate the account.
 
     ![Search for and select the group to apply FGPP](./media/password-policy/fgpp-apply-group.png)
 
-1. With the name of the group you selected now displayed in **Directly Applies To** section, select **OK** to save your custom password policy.
+1. Click **OK** to save your custom password policy.
 
 ## Next steps
 

articles/active-directory/app-provisioning/plan-cloud-hr-provision.md

@@ -25,6 +25,10 @@ Azure AD uses this integration to enable the following cloud HR application (app
 - **Provision cloud-only users to Azure AD:** In scenarios where Active Directory isn't used, provision users directly from the cloud HR app to Azure AD.
 - **Write back to the cloud HR app:** Write the email addresses and username attributes from Azure AD back to the cloud HR app.
 
+The following video provides guidance on planning your HR-driven provisioning integrations.  
+
+> [!VIDEO https://www.youtube-nocookie.com/embed/HsdBt40xEHs]
+
 > [!NOTE]
 > This deployment plan shows you how to deploy your cloud HR app workflows with Azure AD user provisioning. For information on how to deploy automatic user provisioning to software as a service (SaaS) apps, see [Plan an automatic user provisioning deployment](./plan-auto-user-provisioning.md).
 
@@ -90,7 +94,8 @@ You also need a valid Azure AD Premium P1 or higher subscription license for eve
 | Videos | [What is user provisioning in Active Azure Directory?](https://youtu.be/_ZjARPpI6NI) |
 | | [How to deploy user provisioning in Active Azure Directory](https://youtu.be/pKzyts6kfrw) |
 | Tutorials | [List of tutorials on how to integrate SaaS apps with Azure AD](../saas-apps/tutorial-list.md) |
-| | [Tutorial: Configure Workday for automatic user provisioning](../saas-apps/workday-inbound-tutorial.md#frequently-asked-questions-faq) |
+| | [Tutorial: Configure automatic user provisioning with Workday](../saas-apps/workday-inbound-tutorial.md) |
+| | [Tutorial: Configure automatic user provisioning with SAP SuccessFactors](../saas-apps/sap-successfactors-inbound-provisioning-tutorial.md) |
 | FAQ | [Automated user provisioning](../app-provisioning/user-provisioning.md#what-applications-and-systems-can-i-use-with-azure-ad-automatic-user-provisioning) |
 | | [Provisioning from Workday to Azure AD](../saas-apps/workday-inbound-tutorial.md#frequently-asked-questions-faq) |
 

articles/active-directory/authentication/concept-certificate-based-authentication-certificateuserids.md

@@ -141,34 +141,28 @@ IIF(IsPresent([alternativeSecurityId]),
 
 ## Look up certificateUserIds using Microsoft Graph queries
 
-Tenant admins can run MS Graph queries to find all the users with a given certificateUserId value.
+Authorized callers can run Microsoft Graph queries to find all the users with a given certificateUserId value. On the Microsoft Graph [user](/graph/api/resources/user) object, the collection of certificateUserIds are stored in the **authorizationInfo** property.
 
-GET all user objects that have the value '[email protected]' value in certificateUserIds:
+To retrieve all user objects that have the value '[email protected]' in certificateUserIds:
 
-```http
-GET  https://graph.microsoft.com/v1.0/users?$filter=certificateUserIds/any(x:x eq '[email protected]')
-```
- 
-```http
-GET https://graph.microsoft.com/v1.0/users?$filter=startswith(certificateUserIds, '[email protected]')
+```msgraph-interactive
+GET https://graph.microsoft.com/v1.0/users?$filter=authorizationInfo/certificateUserIds/any(x:x eq '[email protected]')&$count=true
+ConsistencyLevel: eventual
 ```
 
-```http
-GET https://graph.microsoft.com/v1.0/users?$filter=certificateUserIds eq '[email protected]'
-```
+You can also use the `not` and `startsWith` operators to match the filter condition. To filter against the certificateUserIds object, the request must include the `$count=true` query string and the **ConsistencyLevel** header set to `eventual`.
 
-## Update certificate user IDs using Microsoft Graph queries
-PATCH the user object certificateUserIds value for a given userId
+## Update certificateUserIds using Microsoft Graph queries
+
+Run a PATCH request to update the certificateUserIds for a given user.
 
 #### Request body:
 
 ```http
-PATCH https://graph.microsoft.us/v1.0/users/{id}
+PATCH https://graph.microsoft.com/v1.0/users/{id}
 Content-Type: application/json
-{
 
-    "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users(authorizationInfo,department)/$entity",
-    "department": "Accounting",
+{
     "authorizationInfo": {
         "certificateUserIds": [
             "X509:<PN>123456789098765@mil"

articles/active-directory/authentication/howto-mfa-getstarted.md

@@ -4,7 +4,7 @@ description: Learn about deployment considerations and strategy for successful i
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: how-to
-ms.date: 01/29/2023
+ms.date: 03/06/2023
 ms.author: justinha
 author: justinha
 manager: amycolannino
@@ -187,7 +187,7 @@ If the user does not have a backup method available, you can:
 
 - Provide them a Temporary Access Pass so that they can manage their own authentication methods. You can also provide a Temporary Access Pass to enable temporary access to resources. 
 - Update their methods as an administrator. To do so, select the user in the Azure portal, then select Authentication methods and update their methods.
-User communications
+
 
 ## Plan integration with on-premises systems