fix merge conflicts

Author: tamram

.openpublishing.publish.config.json

@@ -896,7 +896,7 @@
     ".openpublishing.redirection.defender-for-cloud.json",
     ".openpublishing.redirection.defender-for-iot.json",
     ".openpublishing.redirection.healthcare-apis.json",
-    ".openpublishing.redirection.iot-hub.json",
+    "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
     ".openpublishing.redirection.app-service.json",
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.sql-database.json",
@@ -950,7 +950,7 @@
     "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
     "articles/applied-ai-services/.openpublishing.archived.json",
     "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
-    ".openpublishing.redirection.baremetal-infrastructure.json"
-
+    ".openpublishing.redirection.baremetal-infrastructure.json",
+    "articles/iot-dps/.openpublishing.redirection.iot-dps.json"
   ]
 }

.openpublishing.redirection.json

@@ -14138,61 +14138,6 @@
             "redirect_url": "/azure/industry-marketing/retail/visual-search-use-case-overview",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/iot-dps/concepts-auto-provisioning.md",
-            "redirect_url": "/azure/iot-dps/concepts-roles-operations",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/concepts-device.md",
-            "redirect_url": "/azure/iot-dps/concepts-service",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/concepts-security.md",
-            "redirect_url": "/azure/iot-dps/concepts-service#attestation-mechanism",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/use-hsm-with-sdk.md",
-            "redirect_url": "/azure/iot-dps/tutorial-custom-hsm-enrollment-group-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-use-sdk-tools.md",
-            "redirect_url": "/azure/iot-dps/tutorial-custom-hsm-enrollment-group-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-manage-enrollments-sdks.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509-java",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-manage-dps-with-cli.md",
-            "redirect_url": "/azure/iot-dps/quick-setup-auto-provision-cli",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-net-provision-device-to-hub.md",
-            "redirect_url": "/azure/iot-dps/",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-provision-device-to-hub.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-set-up-cloud.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-set-up-device.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/security/fundamentals/iot-overview.md",
             "redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
@@ -26493,11 +26438,6 @@
             "redirect_url": "https://github.com/Azure/azure-webjobs-sdk/wiki",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-connect-mxchip-iot-devkit.md",
-            "redirect_url": "/azure/iot-develop/quickstart-devkit-mxchip-az3166",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/app-service-api/app-service-api-dotnet-swashbuckle-customize.md",
             "redirect_url": "https://github.com/Azure-Samples/app-service-api-dotnet-swashbuckle-swaggerresponse",
@@ -28574,116 +28514,6 @@
             "redirect_url": "/azure/aks/integrations#open-source-and-third-party-integrations",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-node.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-python.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-symmetric-key-java.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-java.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-node.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-python.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-java.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-node.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-python.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-java.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-node.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-python.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-java.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-node.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-python.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-use-custom-allocation-policies.md",
-            "redirect_url": "/azure/iot-dps/tutorial-custom-allocation-policies",
-            "redirect_document_id": false
-          },          
         {
             "source_path_from_root": "/articles/app-service/environment/app-service-app-service-environment-web-application-firewall.md",
             "redirect_url": "/azure/app-service/environment/integrate-with-application-gateway",
@@ -28944,6 +28774,7 @@
             "redirect_url": "/troubleshoot/azure/azure-kubernetes/troubleshoot-kubernetes-event-driven-autoscaling-add-on?context=/azure/aks/context/aks-context",
             "redirect_document_id": false
         }
+
     ]
 }
 

.openpublishing.redirection.virtual-desktop.json

@@ -34,6 +34,11 @@
             "source_path_from_root": "/articles/virtual-machines/windows/using-visual-studio-vm.md",
             "redirect_url": "/visualstudio/install/using-visual-studio-vm",
             "redirect_document_id": false
-        }        
+        },
+        {
+            "source_path": "articles/virtual-desktop/azure-stack-hci-faq.yml",
+            "redirect_url": "/azure/virtual-desktop/azure-stack-hci",
+            "redirect_document_id": false
+        }       
     ]
 }

articles/active-directory-b2c/partner-gallery.md

@@ -102,13 +102,13 @@ Microsoft partners with the following ISVs for Web Application Firewall (WAF).
 |  ![Screenshot of Azure WAF logo](./media/partner-gallery/azure-web-application-firewall-logo.png) | [Azure WAF](./partner-azure-web-application-firewall.md) provides centralized protection of your web applications from common exploits and vulnerabilities.  |
 ![Screenshot of Cloudflare logo](./media/partner-gallery/cloudflare-logo.png) | [Cloudflare](./partner-cloudflare.md) is a WAF provider that helps organizations protect against malicious attacks that aim to exploit vulnerabilities such as SQLi, and XSS. |
 
-## Identity verification tools 
+## Developer tools 
 
 Microsoft partners with the following ISVs for tools that can help with implementation of your authentication solution.
 
 | ISV partner | Description and integration walkthroughs |
 |:-------------------------|:--------------|
-| ![Screenshot of a grit ief editor logo.](./media/partner-gallery/grit-logo.png) | [Grit Visual Identity Experience Framework Editor](./partner-grit-editor.md) is a tool that saves time during authentication deployment. It supports multiple languages without the need to write code. It also has a no code debugger for user journeys.|
+| ![Screenshot of a grit ief editor logo.](./media/partner-gallery/grit-logo.png) | [Grit Visual Identity Experience Framework Editor](./partner-grit-editor.md) provides a low code/no code experience for developers to create sophisticated authentication user journeys. The tool comes with integrated debugger and templates for the most used scenarios.|
 
 ## Additional information
 

articles/active-directory/authentication/concept-authentication-strengths.md

@@ -6,7 +6,7 @@ services: multi-factor-authentication
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 10/04/2022
+ms.date: 10/13/2022
 
 ms.author: justinha
 author: justinha
@@ -188,6 +188,7 @@ In external user scenarios, the authentication methods that can satisfy authenti
 |FIDO2 security key                           | ✅        |          |
 |Windows Hello for Business                   | ✅        |          |
 
+For more information about how to set authentication strengths for external users, see [Conditional Access: Require an authentication strength for external users](../conditional-access/howto-conditional-access-policy-authentication-strength-external.md).
 
 ### User experience for external users
 
@@ -209,7 +210,8 @@ An authentication strength Conditional Access policy works together with [MFA tr
 - **Authentication strength is not enforced on Register security information user action** – If an Authentication strength Conditional Access policy targets **Register security information** user action, the policy would not apply. 
 
 - **Conditional Access audit log** – When a Conditional Access policy with the authentication strength grant control is created or updated in the Azure AD portal, the auditing log includes details about the policy that was updated, but doesn't include the details about which authentication strength is referenced by the Conditional Access policy. This issue doesn't exist when a policy is created or updated By using Microsoft Graph APIs.
-<!-- Namrata to update about B2B--->
+
+- **Using 'Require one of the selected controls' with 'require authentication strength' control** - After you select authentication strengths grant control and additional controls, all the selected controls must be satisfied in order to gain access to the resource. Using **Require one of the selected controls** isn't applicable, and will default to requiring all the controls in the policy.
 
 ## Limitations
 

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

@@ -134,8 +134,9 @@ To map the pattern supported by certificateUserIds, administrators must use expr
 You can use the following expression for mapping to SKI and SHA1-PUKEY:
 
 ```
-(Contains([alternativeSecurityId],"x509:\<SKI>")>0,[alternativeSecurityId],Error("No altSecurityIdentities SKI match found."))
-& IIF(Contains([alternativeSecurityId],"x509:\<SHA1-PUKEY>")>0,[alternativeSecurityId],Error("No altSecurityIdentities SHA1-PUKEY match found."))
+IF(IsPresent([alternativeSecurityId]),
+                Where($item,[alternativeSecurityId],BitOr(InStr($item, "x509:<SKI>"),InStr($item, "x509:<SHA1-PUKEY>"))>0),[alternativeSecurityId]
+)
 ```
 
 ## Look up certificateUserIds using Microsoft Graph queries