Resolve merge conflict

Author: JKirsch1

.openpublishing.redirection.json

@@ -1,5 +1,115 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/extended-zones/arc-enabled-workloads-postgre-sql.md",
+      "redirect_url": "/azure/extended-zones/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-add-storage.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-add-storage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-additional-resources.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-additional-resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-cluster-gui.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-cluster-gui",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-configure-dns.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-configure-dns",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-data-ingest.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-data-ingest",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-demo-links.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-demo-links",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-deploy-overview.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-deploy-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-deploy-plan.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-deploy-plan",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-deploy.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-deploy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-enable-support.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-enable-support",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-faq.yml",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-manage-cluster.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-manage-cluster",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-mount-clients.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-mount-clients",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-non-owner.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-non-owner",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-open-ticket.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-open-ticket",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-overview.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-prereqs.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-prereqs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-tuning.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-tuning",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/avere-vfxt-whitepapers.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/avere-vfxt-whitepapers",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/disaster-recovery.md",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/disaster-recovery",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/avere-vfxt/index.yml",
+      "redirect_url": "/previous-versions/azure/avere-vfxt/index",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-health-insights/configure-containers.md",
       "redirect_url": "/previous-versions/azure/azure-health-insights/configure-containers",
@@ -5375,51 +5485,6 @@
       "redirect_url": "/azure/role-based-access-control/resource-provider-operations",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/scheduler/get-started-portal.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-advanced-complexity.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-concepts-terms.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-high-availability-reliability.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-intro.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-limits-defaults-errors.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-outbound-authentication.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-plans-billing.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/scheduler/scheduler-powershell-reference.md",
-      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/sdks/index.yml",
       "redirect_url": "https://azure.microsoft.com/downloads/",
@@ -6890,6 +6955,11 @@
       "redirect_url": "/azure/reliability/reliability-nat-gateway",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/iot-operations/connect-to-cloud/howto-configure-opentelemetry-endpoint.md",
+      "redirect_url": "/azure/iot-operations/connect-to-cloud/open-telemetry",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/synapse-analytics/sql/get-started-azure-data-studio.md",
       "redirect_url": "/azure/synapse-analytics/sql/get-started-ssms",

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

@@ -43,7 +43,7 @@ The default name of the **Change email** button in *selfAsserted.html* is **chan
 [!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
 
 
-- The B2C users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**. Ensure **Authentication contact info** is set. B2C users created via a Sign-up flow has this set by default. For users created via Azure Portal or by Graph API, you need to set **Authentication contact info** for SSPR to work. 
+- The B2C users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**. Ensure **Authentication contact info** is set. B2C users created via a Sign-up flow has this set by default. For users created via Azure portal or by Graph API, you need to set **Authentication contact info** for SSPR to work. 
 
 
 ## Self-service password reset (recommended)

articles/active-directory-b2c/configure-authentication-sample-spa-app.md

@@ -160,7 +160,7 @@ const msalConfig = {
       clientId: "<your-MyApp-application-ID>", // This is the ONLY mandatory field; everything else is optional.
       authority: b2cPolicies.authorities.signUpSignIn.authority, // Choose sign-up/sign-in user-flow as your default.
       knownAuthorities: [b2cPolicies.authorityDomain], // You must identify your tenant's domain as a known authority.
-      redirectUri: "http://localhost:6420", // You must register this URI on Azure Portal/App Registration. Defaults to "window.location.href".
+      redirectUri: "http://localhost:6420", // You must register this URI on Azure portal/App Registration. Defaults to "window.location.href".
     },
     cache: {
       cacheLocation: "sessionStorage",  

articles/active-directory-b2c/custom-email-mailjet.md

@@ -46,7 +46,7 @@ If you don't already have one, start by setting up a Mailjet account (Azure cust
 2. Navigate to the [API Key Management page](https://dev.mailjet.com/email/guides/senders-and-domains/#use-a-sender-on-all-api-keys-(metasender)). Record the **API Key** and **Secret Key** for use in a later step. Both keys are generated automatically when your account is created.
 
 > [!IMPORTANT]
-> Mailjet offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://documentation.mailjet.com/hc/en-us/articles/1260803352789-Dedicated-IPs-What-They-Are-and-How-to-Warm-Them-Up). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [How do I warm up my IP ?](https://documentation.mailjet.com/hc/articles/1260803352789-How-do-I-warm-up-my-IP-).
+> Mailjet offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://documentation.mailjet.com/hc/en-us/articles/1260803352789-Dedicated-IPs-What-They-Are-and-How-to-Warm-Them-Up). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [How do I warm up my IP ?](https://documentation.mailjet.com/hc/articles/1260803352789-How-do-I-warm-up-my-IP-)
 
 ## Create Azure AD B2C policy key
 

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

@@ -531,7 +531,7 @@ The following IDs are used for [RESTful service technical profile](restful-techn
 
 ## Microsoft Entra multifactor authentication error messages
 
-The following IDs are used for an [Microsoft Entra ID multifactor authentication technical profile](multi-factor-auth-technical-profile.md) error message:
+The following IDs are used for a [Microsoft Entra ID multifactor authentication technical profile](multi-factor-auth-technical-profile.md) error message:
 
 | ID | Default value |
 | --- | ------------- |

articles/active-directory-b2c/partner-dynamics-365-fraud-protection.md

@@ -94,7 +94,7 @@ Learn more: [UI customization documentation](./customize-ui-with-html.md?pivots=
 
 ### Add policy keys for your Microsoft DFP client app ID and secret
 
-1. In the Microsoft Entra tenant where Microsoft DFP is set up, create an [Microsoft Entra application and grant admin consent](/dynamics365/fraud-protection/integrate-real-time-api#create-azure-active-directory-applications).
+1. In the Microsoft Entra tenant where Microsoft DFP is set up, create a [Microsoft Entra application and grant admin consent](/dynamics365/fraud-protection/integrate-real-time-api#create-azure-active-directory-applications).
 2. Create a secret value for this application registration. Note the application client ID and client secret value.
 3. Save the client ID and client secret values as [policy keys in your Azure AD B2C tenant](./policy-keys-overview.md).
 

articles/active-directory-b2c/partner-onfido.md

@@ -113,7 +113,7 @@ REST API settings:
 #### Upload your files
 
 1. Store the UI folder files in your blob container.
-2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
+2. [Use Azure Storage Explorer to manage Azure Managed Disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
 
 ### Configure Azure AD B2C
 

articles/active-directory-b2c/partner-trusona.md

@@ -19,7 +19,7 @@ ms.custom: sfi-image-nochange
 
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
-In this sample tutorial, you learn how to integrate Azure AD B2C authentication with [Trusona Authentication Cloud](https://www.trusona.com/white-paper/trusona-authentication-cloud-white-paper). It's a cloud-based service enabling users to authenticate with a **tap-and-go** experience, without the need for any kind of mobile authenticator app.
+In this sample tutorial, you learn how to integrate Azure AD B2C authentication with [Trusona Authentication Cloud](https://www.trusona.com/white-papers). It's a cloud-based service enabling users to authenticate with a **tap-and-go** experience, without the need for any kind of mobile authenticator app.
 
 Benefits of integrating Trusona Authentication Cloud with Azure AD B2C include:
 -	Deliver strong authentication with a better user experience

articles/active-directory-b2c/technicalprofiles.md

@@ -311,7 +311,7 @@ In the following technical profile:
 
 ## Persisted claims
 
-The **PersistedClaims** element contains all of the values that should be persisted by an [Microsoft Entra ID technical profile](active-directory-technical-profile.md) with possible mapping information between a claim type already defined in the [ClaimsSchema](claimsschema.md) section in the policy and the Microsoft Entra attribute name.
+The **PersistedClaims** element contains all of the values that should be persisted by a [Microsoft Entra ID technical profile](active-directory-technical-profile.md) with possible mapping information between a claim type already defined in the [ClaimsSchema](claimsschema.md) section in the policy and the Microsoft Entra attribute name.
 
 The name of the claim is the name of the [Microsoft Entra attribute](user-profile-attributes.md) unless the **PartnerClaimType** attribute is specified, which contains the Microsoft Entra attribute name.
 

articles/api-center/agent-to-agent-overview.md

@@ -5,7 +5,7 @@ description: "Overview of the agent registry for discovering, registering, and m
 
 ms.service: azure-api-center
 ms.topic: overview
-ms.date: 11/03/2025
+ms.date: 02/24/2026
 ms.update-cycle: 180-days
 ms.collection: ce-skilling-ai-copilot
 
@@ -31,7 +31,7 @@ Azure API Center provides a centralized platform for discovering, registering, a
 
 ## Register an AI agent
 
-You can register AI agents in API Center similar to how you register other APIs. During registration, specify the API type as **A2A** and fill in details for **Agent Card**, **Agent Skills**, and **Agent Capabilities**.  
+You can register AI agents in API Center similar to how you register other assets such as APIs and MCP servers. During registration, fill in details for **Agent Card**, **Agent Skills**, and **Agent Capabilities**.  
 
 For detailed steps, see [Register agent](register-manage-agents.md#register-agent).