resolve conflicts

Author: mumian

.openpublishing.redirection.json

@@ -1,5 +1,140 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/healthcare-apis/iot/concepts-machine-learning.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/concepts-machine-learning",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/concepts-power-bi.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/concepts-power-bi",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/concepts-teams.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/concepts-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/configure-metrics.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/configure-metrics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/deploy-arm-template.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/deploy-arm-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/deploy-bicep-powershell-cli.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/deploy-bicep-powershell-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/deploy-choose-method.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/deploy-choose-method",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/deploy-json-powershell-cli.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/deploy-json-powershell-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/deploy-manual-portal.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/deploy-manual-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/device-messages-through-iot-hub.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/device-messages-through-iot-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/frequently-asked-questions.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/frequently-asked-questions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/get-started.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/git-projects.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/git-projects",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/how-to-enable-diagnostic-settings.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/how-to-enable-diagnostic-settings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/how-to-use-calculatedcontent-templates.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/how-to-use-custom-functions.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/how-to-use-custom-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/how-to-use-mapping-debugger.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/how-to-use-mapping-debugger",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/how-to-use-monitoring-and-health-checks-tabs.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/how-to-use-monitoring-and-health-checks-tabs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/index.yml",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/overview-of-device-data-processing-stages.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/overview-of-device-mapping.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/overview-of-device-mapping",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/overview-of-fhir-destination-mapping.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/overview-of-fhir-destination-mapping",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/overview-of-samples.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/overview-of-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/overview.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/troubleshoot-errors-deployment.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/troubleshoot-errors-deployment",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/iot/troubleshoot-errors-logs.md",
+      "redirect_url": "/previous-versions/azure/healthcare-apis/iot/troubleshoot-errors-logs",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/sentinel/datalake/sentinel-mcp-chatgpt-connector.md",
       "redirect_url": "/azure/sentinel/datalake/sentinel-mcp-chatgpt-claude-connector",

articles/app-service/app-service-key-vault-references.md

@@ -90,6 +90,9 @@ After you grant permissions to the user-assigned identity, follow these steps:
 
 This setting applies to all Key Vault references for the app.
 
+> [!TIP]
+> If you want to revert your app to use the system-assigned identity, set the value to `SystemAssigned` instead of the Resource ID.
+
 ## <a name = "rotation"></a> Understand rotation
 
 If the secret version isn't specified in the reference, the app uses the latest version that exists in the key vault. When newer versions become available, such as with rotation, the app is automatically updated and begins using the latest version within 24 hours.

articles/app-service/configure-authentication-provider-openid-connect.md

@@ -32,7 +32,7 @@ When you register your app, you need to collect a *client ID* and a *client secr
 > - The client secret value is an important security credential. Don't share this secret with anyone or distribute it within a client application.
 > - Your app must provide the client secret if you want users to acquire access tokens using the interactive authorization code flow. If you don't want to acquire access tokens, you don't need to use a secret.
 
-You also need the provider's OIDC metadata. This metadata is often exposed in a [configuration metadata document](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig) that you can get at the path formed by appending `/.well-known/openid-configuration` to the provider's issuer URL.
+You also need the provider's OIDC metadata. This metadata is often exposed in a [configuration metadata document](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig) that you can get at the path formed by appending `/.well-known/openid-configuration` to the provider's issuer URL. The metadata includes `mtls_endpoint_aliases` as part of [Mutual-TLS Client Authentication](https://datatracker.ietf.org/doc/html/rfc8705).
 
 If you can't access a configuration metadata document, get the following values separately:
 

articles/app-service/reference-app-settings.md

@@ -306,7 +306,7 @@ APACHE_RUN_GROUP | RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc
 > | `WORDPRESS_ADMIN_EMAIL` | Deployment only | Not applicable | Not applicable | WordPress admin email. |
 > | `WORDPRESS_ADMIN_PASSWORD` | Deployment only | Not applicable | Not applicable | WordPress admin password. This setting is only for deployment purposes. Modifying this value has no effect on the WordPress installation. To change the WordPress admin password, see [Reset your password](https://wordpress.org/support/article/resetting-your-password/#to-change-your-password). |
 > | `WORDPRESS_ADMIN_USER` | Deployment only | Not applicable | Not applicable|WordPress admin username. |
-> | `WORDPRESS_ADMIN_LOCALE_CODE` | Deployment only | Not applicable | Not applicable | Database username used to connect to WordPress. |
+> | `WORDPRESS_LOCALE_CODE` | Deployment only | `en_US` | Not applicable | WordPress localization code for site language. |
 
 ## Domain and DNS