Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI147804-mdc-m365

Author: ElazarK

.openpublishing.publish.config.json

@@ -230,6 +230,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "function-app-arm-templates",
+      "url": "https://github.com/Azure-Samples/function-app-arm-templates",
+      "branch": "main",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",

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

@@ -1,5 +1,11 @@
 {
     "redirections": [          
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/faqs-eiot.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise#frequently-asked-questions",
+            "redirect_document_id": false
+        },
+
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md",
             "redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",

.openpublishing.redirection.json

@@ -555,6 +555,11 @@
       "redirect_url": "/previous-versions/azure/cognitive-services/Bing-Web-Search/hit-highlighting",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Bing-Web-Search/index.yml",
+      "redirect_url": "/previous-versions/azure/cognitive-services/Bing-Web-Search/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/Bing-Web-Search/language-support.md",
       "redirect_url": "/previous-versions/azure/cognitive-services/Bing-Web-Search/language-support",
@@ -778,6 +783,76 @@
     {
       "source_path": "articles/cognitive-services/bing-visual-search/quickstarts/ruby.md",
       "redirect_url": "/previous-versions/azure/cognitive-services/bing-visual-search/quickstarts/ruby",
+      "redirect_document_id": false,
+    },
+    {
+      "source_path": "articles/api-management/api-management-api-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-api-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-application-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-application-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-customize-styles.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-customize-styles",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-developer-portal-templates-reference.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-developer-portal-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-issue-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-issue-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-modify-content-layout.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-modify-content-layout",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-page-controls.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-page-controls",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-page-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-page-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-product-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-product-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-template-data-model-reference.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-template-data-model-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-template-resources.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-template-resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/api-management-user-profile-templates.md",
+      "redirect_url": "/previous-versions/azure/api-management/api-management-user-profile-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/developer-portal-deprecated-migration.md",
+      "redirect_url": "/previous-versions/azure/api-management/developer-portal-deprecated-migration",
       "redirect_document_id": false
     },
     {
@@ -790,6 +865,11 @@
       "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-acs-migration",
       "redirect_document_id": false
     },
+    {
+        "source_path": "articles/azure-arc/vmware-vsphere/switch-to-new-preview-version.md",
+        "redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version-vmware",
+        "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/azuread-dev/active-directory-authentication-libraries.md",
       "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-authentication-libraries",

articles/active-directory-b2c/add-api-connector-token-enrichment.md

@@ -258,8 +258,7 @@ Repeat this step for the **ProfileEdit.xml**, and **PasswordReset.xml** user jou
 Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensions.xml*, *SignUpOrSignin.xml*, *ProfileEdit.xml*, and *PasswordReset.xml*. 
 ## Test the custom policy
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Make sure you're using the directory that contains your Microsoft Entra tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Microsoft Entra directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
 1. Select **Identity Experience Framework**.
 1. Select **Upload Custom Policy**, and then upload the policy files that you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensions.xml*, *SignUpOrSignin.xml*, *ProfileEdit.xml*, and *PasswordReset.xml*. 

articles/active-directory-b2c/add-api-connector.md

@@ -574,8 +574,7 @@ To return the promo code claim back to the relying party application, add an out
 ## Test the custom policy
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Make sure you're using the directory that contains your Microsoft Entra tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Microsoft Entra directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra ID tenant from the **Directories + subscriptions** menu.
 1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
 1. Select **Identity Experience Framework**.
 1. Select **Upload Custom Policy**, and then upload the policy files that you changed: *TrustFrameworkExtensions.xml*, and *SignUpOrSignin.xml*. 

articles/active-directory-b2c/add-password-change-policy.md

@@ -147,8 +147,7 @@ The password change flow involves the following steps:
 ## Upload and test the policy
 
 1. Sign in to the [Azure portal](https://portal.azure.com/).
-1. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
 1. Select **Identity Experience Framework**.
 1. In **Custom Policies**, select **Upload Policy**.

articles/active-directory-b2c/add-password-reset-policy.md

@@ -65,8 +65,7 @@ The self-service password reset experience can be configured for the Sign in (Re
 To set up self-service password reset for the sign-up or sign-in user flow:
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. In the portal toolbar, select the **Directories + Subscriptions** icon.
-1. In the **Portal settings | Directories + subscriptions** pane, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Select **User flows**.
 1. Select a sign-up or sign-in user flow (of type **Recommended**) that you want to customize.
@@ -283,8 +282,7 @@ Your application might need to detect whether the user signed in by using the Fo
 ### Upload the custom policy
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. In the portal toolbar, select the **Directories + Subscriptions** icon.
-1. In the **Portal settings | Directories + subscriptions** pane, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to the Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. In the menu under **Policies**, select **Identity Experience Framework**.
 1. Select **Upload custom policy**. In the following order, upload the policy files that you changed:

articles/active-directory-b2c/add-ropc-policy.md

@@ -54,9 +54,7 @@ When using the ROPC flow, consider the following:
 ##  Create a resource owner user flow
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as the **global administrator** of your Azure AD B2C tenant.
-2. Make sure you're using the directory that contains your Azure AD B2C tenant:
-    1. Select the **Directories + subscriptions** icon in the portal toolbar.
-    1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Select **User flows**, and select **New user flow**.
 1. Select **Sign in using resource owner password credentials (ROPC)**.

articles/active-directory-b2c/add-sign-in-policy.md

@@ -43,8 +43,7 @@ The sign-in policy lets users:
 To add sign-in policy:
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Select the **Directories + Subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Under **Policies**, select **User flows**, and then select **New user flow**.
 1. On the **Create a user flow** page, select the **Sign in** user flow.
@@ -114,8 +113,7 @@ The **SelfAsserted-LocalAccountSignin-Email** technical profile is a [self-asser
 ## Update and test your policy
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
 1. Select **Identity Experience Framework**.
 1. Select **Upload Custom Policy**, and then upload the policy file that you changed, *TrustFrameworkExtensions.xml*.

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

@@ -47,8 +47,7 @@ Watch this video to learn how the user sign-up and sign-in policy works.
 The sign-up and sign-in user flow handles both sign-up and sign-in experiences with a single configuration. Users of your application are led down the right path depending on the context.
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Select the **Directories + Subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Under **Policies**, select **User flows**, and then select **New user flow**.