Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-arm-terraform-runner

Author: RoseHJM

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}
+ :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}

.openpublishing.publish.config.json

@@ -1232,6 +1232,7 @@
   ".openpublishing.redirection.government.json",
   ".openpublishing.redirection.guidance.json",
   ".openpublishing.redirection.industry.json",
+  ".openpublishing.redirection.iot-develop.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
   ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
@@ -1298,7 +1299,6 @@
   "articles/internet-peering/.openpublishing.redirection.internet-peering.json",
   "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
   "articles/iot-central/.openpublishing.redirection.iot-central.json",
-  "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
   "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",

.openpublishing.redirection.azure-monitor.json

@@ -4131,7 +4131,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/alerts-using-migration-tool.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-using-migration-tool",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
             "redirect_document_id": false
         },
         {
@@ -6259,6 +6259,46 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/autoscale/tutorial-autoscale-performance-schedule",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-automatic-migration.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-automatic-migration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-classic.overview.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-classic.overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-classic-portal.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-classic-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-enable-template.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-enable-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-prepare-migration.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-prepare-migration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-understand-migration.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-understand-migration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-webhooks.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-webhooks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/api-alerts.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/api-alerts",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/essentials/metrics-supported.md",
             "redirect_url": "/azure/azure-monitor/reference/supported-metrics/metrics-index",
@@ -6621,7 +6661,12 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
-            "redirect_url": "/azure/azure-monitor/overview",
+            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
+            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
             "redirect_document_id": false
         },
         {
@@ -6644,5 +6689,6 @@
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
             "redirect_document_id": false
         }
+
     ]
 }

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

@@ -945,6 +945,16 @@
             "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerabilities-for-images.md",
+            "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerabilities-containers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerability-assessment-findings.md",
+            "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerability-registry-images",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
             "redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",

articles/iot-develop/.openpublishing.redirection.iot-develop.json renamed to .openpublishing.redirection.iot-develop.json

@@ -574,6 +574,41 @@
       "source_path_from_root": "/articles/iot/concepts-model-repository.md",
       "redirect_url": "/azure/iot/concepts-model-discovery",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/quickstart-send-telemetry-iot-hub.md",
+      "redirect_url": "/azure/iot/tutorial-send-telemetry-iot-hub",
+      "redirect_document_id": true      
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/tutorial-use-mqtt.md",
+      "redirect_url": "/azure/iot/tutorial-use-mqtt",
+      "redirect_document_id": true      
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/quickstart-devkit-espressif-esp32-freertos-iot-hub.md",
+      "redirect_url": "/azure/iot/tutorial-devkit-espressif-esp32-freertos-iot-hub",
+      "redirect_document_id": true      
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/concepts-iot-device-types.md",
+      "redirect_url": "/azure/iot/concepts-iot-device-types",
+      "redirect_document_id": true      
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/concepts-using-c-sdk-and-embedded-c-sdk.md",
+      "redirect_url": "/azure/iot/concepts-using-c-sdk-and-embedded-c-sdk",
+      "redirect_document_id": true      
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/concepts-manage-device-reconnections.md",
+      "redirect_url": "/azure/iot/concepts-manage-device-reconnections",
+      "redirect_document_id": true      
+    },
+    {
+      "source_path_from_root": "/articles/iot-develop/iot-device-selection.md",
+      "redirect_url": "/azure/iot/concepts-iot-device-selection",
+      "redirect_document_id": true      
     }
   ]
 }

.openpublishing.redirection.json

@@ -1065,6 +1065,16 @@
             "redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/container-instances/container-instances-region-availability.md",
+            "redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-instances/tutorial-docker-compose.md",
+            "redirect_url": "/azure/container-instances/container-instances-multi-container-group",
+            "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",
@@ -3924,6 +3934,16 @@
             "redirect_url": "/azure/operational-excellence/relocation-storage-account",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/kubernetes-fleet/resource-propagation.md",
+            "redirect_url": "/azure/kubernetes-fleet/concepts-resource-propagation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/kubernetes-fleet/access-fleet-kubernetes-api.md",
+            "redirect_url": "/azure/kubernetes-fleet/quickstart-access-fleet-kubernetes-api",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/update-legacy-ot-software.md",
             "redirect_url": "/azure/defender-for-iot/organizations/update-ot-software?tabs=portal",
@@ -3949,6 +3969,11 @@
             "source_path_from_root":"/articles/virtual-network-manager/concept-security-admin-rules-network-groups.md",
             "redirect_url":"/azure/virtual-network-manager/overview",
             "redirect_document_id":false 
+        },
+        {
+            "source_path_from_root":"/articles/trusted-signing/concept.md",
+            "redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
+            "redirect_document_id":false 
         }
     ]
 }

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/sap/deploy-data-connector-agent-container-other-methods.md",
+            "redirect_url": "/azure/sentinel/sap/deploy-data-connector-agent-container",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/sentinel/data-connectors/abnormalsecurity-using-azure-function.md",
             "redirect_url": "/azure/sentinel/data-connectors/abnormalsecurity-using-azure-functions",

.openpublishing.redirection.virtual-desktop.json

@@ -404,6 +404,11 @@
             "source_path_from_root": "/articles/virtual-desktop/whats-new-client-microsoft-store.md",
             "redirect_url": "/azure/virtual-desktop/whats-new-client-windows",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/autoscale-scaling-plan.md",
+            "redirect_url": "/azure/virtual-desktop/autoscale-create-assign-scaling-plan",
+            "redirect_document_id": true
         }
     ]
 }

articles/.openpublishing.redirection.private-multi-access-edge-compute-mec.json

@@ -0,0 +1,15 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/private-multi-access-edge-compute-mec/affirmed-private-network-service-overview.md ",
+            "redirect_url": "/azure/private-multi-access-edge-compute-mec/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/private-multi-access-edge-compute-mec/deploy-affirmed-private-network-service-solution.md ",
+            "redirect_url": "/azure/private-multi-access-edge-compute-mec/overview",
+            "redirect_document_id": false
+                
+        }
+   ]
+}

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -31,17 +31,18 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
 - Support requests for public preview features can be submitted through regular support channels.
 
 ## User flows
-
 |Feature  |User flow  |Custom policy  |Notes  |
 |---------|:---------:|:---------:|---------|
 | [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA| |
 | [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password.| GA | GA | |
 | [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
 | [Self-Service password reset](add-password-reset-policy.md) | GA| GA| |
 | [Force password reset](force-password-reset.md) | GA | NA | |
-| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | |
-| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications |
+| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| Available in China cloud, but only for custom policies.
+| [Force password reset](force-password-reset.md) | GA | GA | Available in China cloud, but only for custom policies. |
+| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | Available in China cloud, but only for custom policies. |
 | [Smart lockout](threat-management.md) | GA | GA | |
+| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications. Limited CA features are available in China cloud. Identity Protection is not available in China cloud. |
 | [CAPTCHA](add-captcha.md) | Preview | Preview | You can enable it during sign-up or sign-in for Local accounts. |
 
 ## OAuth 2.0 application authorization flows
@@ -86,15 +87,15 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 
 |Feature  |User flow  |Custom policy  |Notes  |
 |---------|:---------:|:---------:|---------|
-| [Multi-language support](localization.md)| GA | GA | |
-| [Custom domains](custom-domain.md)| GA | GA | |
+| [Multi-language support](localization.md)| GA | GA | Available in China cloud, but only for custom policies. |
+| [Custom domains](custom-domain.md)| GA | GA | Available in China cloud, but only for custom policies. |
 | [Custom email verification](custom-email-mailjet.md) | NA | GA| |
 | [Customize the user interface with built-in templates](customize-ui.md) | GA| GA| |
 | [Customize the user interface with custom templates](customize-ui-with-html.md) | GA| GA| By using HTML templates. |
-| [Page layout version](page-layout.md) | GA | GA | |
-| [JavaScript](javascript-and-page-layout.md) | GA | GA | |
+| [Page layout version](page-layout.md) | GA | GA | Available in China cloud, but only for custom policies. |
+| [JavaScript](javascript-and-page-layout.md) | GA | GA | Available in China cloud, but only for custom policies. |
 | [Embedded sign-in experience](embedded-login.md) | NA |  Preview| By using the inline frame element `<iframe>`. |
-| [Password complexity](password-complexity.md) | GA | GA | |
+| [Password complexity](password-complexity.md) | GA | GA | Available in China cloud, but only for custom policies. |
 | [Disable email verification](disable-email-verification.md) | GA|  GA| Not recommended for production environments. Disabling email verification in the sign-up process may lead to spam. |
 
 
@@ -106,7 +107,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 |---------|:---------:|:---------:|---------|
 |[AD FS](identity-provider-adfs.md) | NA | GA | |
 |[Amazon](identity-provider-amazon.md) | GA | GA | |
-|[Apple](identity-provider-apple-id.md) | GA | GA | |
+|[Apple](identity-provider-apple-id.md) | GA | GA | Available in China cloud, but only for custom policies. |
 |[Microsoft Entra ID (Single-tenant)](identity-provider-azure-ad-single-tenant.md) | GA | GA | |
 |[Microsoft Entra ID (multitenant)](identity-provider-azure-ad-multi-tenant.md) | NA  | GA | |
 |[Azure AD B2C](identity-provider-azure-ad-b2c.md) | GA | GA | |
@@ -121,7 +122,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 |[Salesforce](identity-provider-salesforce.md) | GA | GA | |
 |[Salesforce (SAML protocol)](identity-provider-salesforce-saml.md) | NA | GA | |
 |[Twitter](identity-provider-twitter.md) | GA | GA | |
-|[WeChat](identity-provider-wechat.md) | Preview | GA | |
+|[WeChat](identity-provider-wechat.md) | Preview | GA | Available in China cloud, but only for custom policies. |
 |[Weibo](identity-provider-weibo.md) | Preview | GA | |
 
 ## Generic identity providers
@@ -153,18 +154,18 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 
 | Feature |  Custom policy | Notes |
 | ------- | :--: | ----- |
-| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | GA |  |
-| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | GA |  |
-| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | GA |  |
-| [OAuth SSO Session Provider](custom-policy-reference-sso.md#oauthssosessionprovider)  | GA|  |
+| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
+| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
+| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
+| [OAuth SSO Session Provider](custom-policy-reference-sso.md#oauthssosessionprovider)  | GA| Available in China cloud, but only for custom policies. |
 
 
 ### Components
 
 | Feature | Custom policy | Notes |
 | ------- | :--: | ----- |
 | [MFA using time-based one-time password (TOTP) with authenticator apps](multi-factor-authentication.md#verification-methods) | GA |  Users can use any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app).|
-| [Phone factor authentication](phone-factor-technical-profile.md) | GA |  |
+| [Phone factor authentication](phone-factor-technical-profile.md) | GA |  Available in China cloud, but only for custom policies.  |
 | [Microsoft Entra multifactor authentication authentication](multi-factor-auth-technical-profile.md) | GA |  |
 | [One-time password](one-time-password-technical-profile.md) | GA |  |
 | [Microsoft Entra ID](active-directory-technical-profile.md) as local directory | GA |  |