Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into azure-openai-on-your-data

Author: ShawnJackson

.openpublishing.redirection.azure-arc-scvmm.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+      {
+          "source_path_from_root": "/articles/azure-arc/system-center-virtual-machine-manager/enable-group-management.md",
+          "redirect_url": "enable-guest-management-at-scale",
+          "redirect_document_id": false
+      }
+    ]
+}

.openpublishing.redirection.azure-monitor.json

@@ -10,6 +10,11 @@
             "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
             "redirect_document_id": false
          },
+        {
+            "source_path_from_root": "/articles/azure-monitor/scom-manage-instance/common-questions.md",
+            "redirect_url": "/azure/azure-monitor/scom-manage-instance/scom-managed-instance-faq",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/vm/scom-managed-instance-overview.md",
             "redirect_url": "/azure/azure-monitor/scom-manage-instance/overview",

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/firewall-manager/multiple-public-ip-powershell.md",
+      "redirect_url": "/previous-versions/azure/firewall-manager/multiple-public-ip-powershell",
+      "redirect_document_id": false
+    },
         {
              "source_path_from_root": "/articles/application-gateway/scripts/create-vmss-waf-cli.md",
              "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-cli",
@@ -265,6 +270,26 @@
             "redirect_url": "/azure/advisor/advisor-alerts-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/advisor/advisor-operational-excellence-recommendations.md",
+            "redirect_url": "/azure/advisor/advisor-reference-operational-excellence-recommendations",
+            "redirect_document_id": false
+        },
+	            {
+            "source_path_from_root": "/articles/advisor/advisor-performance-recommendations.md",
+            "redirect_url": "/azure/advisor/advisor-reference-performance-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/advisor/advisor-cost-recommendations.md",
+            "redirect_url": "/azure/advisor/advisor-reference-cost-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/advisor/advisor-high-availability-recommendations.md",
+            "redirect_url": "/azure/advisor/advisor-reference-reliability-recommendations",
+            "redirect_document_id": false
+        },	    
         {
             "source_path_from_root": "/articles/network-functions-manager/index.yml",
             "redirect_url": "/azure/network-function-manager",
@@ -1135,6 +1160,11 @@
             "redirect_url": "/azure/container-instances/container-instances-multi-container-group",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/container-instances/container-instances-monitor.md",
+            "redirect_url": "/azure/container-instances/monitor-azure-container-instances",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/cassandra-managed-instance/compare-cosmosdb-managed-instance.md",
             "redirect_url": "/azure/managed-instance-apache-cassandra/compare-cosmosdb-managed-instance",
@@ -3043,6 +3073,11 @@
             "redirect_url": "/sql/sql-server/stretch-database/stretch-database-databases-and-tables-stretch-database-advisor",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-azure-postgresql-to-azure-postgresql-online-portal.md",
+            "redirect_url": "/azure/postgresql/migrate/migration-service/tutorial-migration-service-single-to-flexible",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/vs-azure-tools-access-private-azure-clouds-with-visual-studio.md",
             "redirect_url": "/visualstudio/azure/vs-azure-tools-access-private-azure-clouds-with-visual-studio",
@@ -4089,7 +4124,27 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
+            "source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
+            "redirect_url": "/azure/openshift/create-cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
+            "redirect_url": "/azure/openshift/connect-cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
+            "redirect_url": "/azure/openshift/delete-cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/quickstart-portal.md",
+            "redirect_url": "/azure/openshift/create-cluster",
+            "redirect_document_id": false
+        },
+        {
+           "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
             "redirect_url": "/azure",
             "redirect_document_id": false
         }

articles/active-directory-b2c/identity-provider-wechat.md

@@ -25,18 +25,21 @@ zone_pivot_groups: b2c-policy-type
 ## Prerequisites
 
 [!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
+* Get an approved Weixin Open Platform account at [https://kf.qq.com](https://kf.qq.com/faq/161220Brem2Q161220uUjERB.html).
+* Get an approved application on Weixin Open Platform.
 
 ## Create a WeChat application
 
-To enable sign-in for users with a WeChat account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in [WeChat management center](https://open.weixin.qq.com/). If you don't already have a WeChat account, you can get information at [https://kf.qq.com](https://kf.qq.com/faq/161220Brem2Q161220uUjERB.html).
+To enable sign-in for users with a WeChat account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in [WeChat management center](https://open.weixin.qq.com/). If you don't already have a Weixin Open Platform account, you can get information at [https://kf.qq.com](https://kf.qq.com/faq/161220Brem2Q161220uUjERB.html). The Weixin Open Platform account and application must be approved to link WeChat as an identity provider to your user flow.
 
 ### Register a WeChat application
 
 1. Sign in to [https://open.weixin.qq.com/](https://open.weixin.qq.com/) with your WeChat credentials.
 1. Select **管理中心** (management center).
 1. Follow the steps to register a new application.
-1. For the **授权回调域** (callback URL), enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/oauth2/authresp`. Replace `your-tenant-name` with the name of your tenant, and `your-domain-name` with your custom domain.
-1. Copy the **APP ID** and **APP KEY**. You need both of them to configure the identity provider to your tenant.
+1. In the **Development information** section, set the "Authorization callback domain" to `your-tenant-name.b2clogin.com`.
+1. Ensure that the application status is "Approved".
+1. At the top of **Application details**, copy the **APP ID** and **APP KEY**. You need both of them to configure the identity provider to your tenant.
 
 ::: zone pivot="b2c-user-flow"
 
@@ -51,12 +54,17 @@ To enable sign-in for users with a WeChat account in Azure Active Directory B2C
 1. For the **Client secret**, enter the APP KEY that you recorded.
 1. Select **Save**.
 
+    :::image type="content" source="media/identity-provider-azure-ad-b2c/wechat-client-configuration.png" alt-text="Screenshot that shows the Configure social identity provider window, with completed form fields for social identity provider name, WeChat client ID, and app secret." lightbox="media/identity-provider-azure-ad-b2c/wechat-client-configuration.png":::
+
 ## Add WeChat identity provider to a user flow 
 
 1. In your Azure AD B2C tenant, select **User flows**.
 1. Click the user flow that you want to add the WeChat identity provider.
 1. Under the **Social identity providers**, select **WeChat**.
 1. Select **Save**.
+
+   :::image type="content" source="media/identity-provider-azure-ad-b2c/link-wechat-identity-provider.png" alt-text="Screenshot showing WeChat as a selected identity provider in the Identity Providers section." lightbox="media/identity-provider-azure-ad-b2c/link-wechat-identity-provider.png":::
+
 1. To test your policy, select **Run user flow**.
 1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
 1. Select the **Run user flow** button.