fixing merge conflicts

Author: ShawnJackson

.openpublishing.redirection.json

@@ -1,5 +1,190 @@
 {
   "redirections": [
+     {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/classic-retirement.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/classic-retirement",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/configure-host-pool-personal-desktop-assignment-type-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/configure-host-pool-personal-desktop-assignment-type-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/configure-vm-gpu-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/configure-vm-gpu-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/connect-android-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/connect-android-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/connect-ios-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/connect-ios-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/connect-macos-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/connect-macos-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/connect-web-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/connect-web-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/connect-windows-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/connect-windows-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/create-host-pools-arm-template.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/create-host-pools-arm-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/create-host-pools-azure-marketplace-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/create-host-pools-azure-marketplace-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/create-host-pools-powershell-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/create-host-pools-powershell-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/create-service-principal-role-powershell.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/create-service-principal-role-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/create-validation-host-pool-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/create-validation-host-pool-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/customize-feed-virtual-desktop-users-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/customize-feed-virtual-desktop-users-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/customize-rdp-properties-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/customize-rdp-properties-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/data-locations-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/data-locations-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/delegated-access-virtual-desktop-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/delegated-access-virtual-desktop-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/deploy-diagnostics.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/deploy-diagnostics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/diagnostics-log-analytics-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/diagnostics-log-analytics-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/diagnostics-role-service-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/diagnostics-role-service-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/environment-setup-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/environment-setup-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/expand-existing-host-pool-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/expand-existing-host-pool-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/host-pool-load-balancing-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/host-pool-load-balancing-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/manage-app-groups-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/manage-app-groups-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/manage-resources-using-ui-powershell.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/manage-resources-using-ui-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/manage-resources-using-ui.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/manage-resources-using-ui",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/manual-delete.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/manual-delete",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/publish-apps-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/publish-apps-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/set-up-scaling-script.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/set-up-scaling-script",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/set-up-service-alerts-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/set-up-service-alerts-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/tenant-setup-azure-active-directory.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/tenant-setup-azure-active-directory",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-management-tool.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/troubleshoot-management-tool",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-powershell-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/troubleshoot-powershell-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-service-connection-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/troubleshoot-service-connection-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-set-up-issues-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/troubleshoot-set-up-issues-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-set-up-overview-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/troubleshoot-set-up-overview-2019",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-vm-configuration-2019.md",
+      "redirect_url": "/previous-versions/azure/virtual-desktop-classic/troubleshoot-vm-configuration-2019",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/lab-services/class-type-adobe-creative-cloud.md",
       "redirect_url": "/previous-versions/azure/lab-services/class-type-adobe-creative-cloud",
@@ -3749,6 +3934,56 @@
       "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-cli.md",
       "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-upload-firmware-using-azure-command-line-interface.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-upload-firmware-using-powershell.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/tutorial-analyze-firmware.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-faq.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-rbac.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+     },
+     {
+      "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-portal.md",
+      "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-cli.md",
+      "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-powershell.md",
+      "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-upload-firmware-using-python.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/overview-firmware-analysis.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
     }
   ]
-}
+}

articles/active-directory-b2c/add-captcha.md

@@ -234,9 +234,9 @@ For the various page layouts, use the following page layout versions:
 
 |Page layout |Page layout version range |
 |---------|---------|
-| Selfasserted  | >=2.1.30 |
-| Unifiedssp  | >=2.1.18 |
-|  Multifactor  |    >=1.2.16  |
+| Selfasserted  | >=2.1.33 |
+| Unifiedssp  | >=2.1.21 |
+|  Multifactor  |    >=1.2.19  |
 
 **Example:**
 

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in.md

@@ -1,5 +1,5 @@
 ---
-title: Set up a sign-up and sign-in flow for a local account by using Azure Active Directory B2C custom policy
+title: Set up a sign-up and sign-in flow for a local account
 titleSuffix: Azure AD B2C
 description: Learn how to configure a sign-up and sign-in flow for a local account, using email and password, by using Azure Active Directory B2C custom policy.  
 
@@ -10,7 +10,7 @@ ms.service: azure-active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 10/11/2024
+ms.date: 11/27/2024
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: b2c

articles/active-directory-b2c/data-residency.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: azure-active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 11/27/2024
 ms.author: kengaderdus
 ms.subservice: b2c
 ms.custom: references_regions
@@ -26,7 +26,7 @@ Azure Active Directory B2C (Azure AD B2C) stores customer data in a geographic l
 Region availability and data residency are two different concepts that apply to Azure AD B2C. This article explains the differences between these two concepts, and compares how they apply to Azure versus Azure AD B2C. [Region availability](#region-availability) refers to where a service is available for use whereas [Data residency](#data-residency) refers to where user data is stored.
 
 
-Azure AD B2C is **generally available worldwide** with the option for **data residency** in the **United States, Europe, Asia Pacific, or Australia**.
+Azure AD B2C is **generally available worldwide** with the option for **data residency** in the **United States, Europe, Asia Pacific Australia or New Zealand**.
 
 [Region availability](#region-availability) refers to where a service is available for use. [Data residency](#data-residency) refers to where customer data is stored. For customers in the EU and EFTA, see [EU Data Boundary](#eu-data-boundary).
 
@@ -59,7 +59,7 @@ Data resides in **Asia Pacific** for the following locations:
 
 > Afghanistan (AF), Hong Kong SAR (HK), India (IN), Indonesia (ID), Japan (JP), Korea (KR), Malaysia (MY), Philippines (PH), Singapore (SG), Sri Lanka (LK), Taiwan (TW), and Thailand (TH)
 
-Data resides in **Australia** for the following locations:
+Data resides in Australia or New Zealand for the following locations:
 
 > Australia (AU) and New Zealand (NZ)
 

articles/active-directory-b2c/https-cipher-tls-requirements.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: azure-active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 11/27/2024
 ms.author: kengaderdus
 ms.subservice: b2c
 
@@ -66,7 +66,7 @@ The following endpoints used in your Azure AD B2C environment must comply with t
 
 ## Check your endpoint compatibility
 
-To verify that your endpoints comply with the requirements described in this article, perform a test using a TLS cipher and scanner tool. Test your endpoint using [SSLLABS](https://www.ssllabs.com/ssltest/analyze.html).
+To verify that your endpoints comply with the requirements described in this article, perform a test using a TLS cipher and scanner tool. Test your endpoint using [SSL LABS](https://www.ssllabs.com/ssltest/analyze.html).
 
 
 ## Next steps

articles/active-directory-b2c/localization-string-ids.md

@@ -274,6 +274,7 @@ The following example shows the use of some of the user interface elements in th
     <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidInput">{0} has invalid input.</LocalizedString>
     <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMissingRequiredElement">Missing required element: {0}</LocalizedString>
     <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfValidationError">Error in validation by: {0}</LocalizedString>
+    <LocalizedString ElementType="ErrorMessage" StringId="InvalidUserInput"> An Invalid value was presented for a property</LocalizedString>
   </LocalizedStrings>
 </LocalizedResources>
 ```

articles/active-directory-b2c/media/partner-nok-nok/nok-nok-architecture-diagram.png

@@ -131,5 +131,5 @@ For the following instructions, Haventec is a new OIDC identity provider in the
 
 ## Next steps
 
-* Go to docs.haventec.com for [Haventec Documentation](https://docs.haventec.com/)
+* Go to docs.haventec.com for [Haventec Documentation](https://www.haventec.com/)
 * [Azure AD B2C custom policy overview](custom-policy-overview.md)