Resolve merge conflict

Author: JKirsch1

.openpublishing.publish.config.json

@@ -506,6 +506,18 @@
             "branch": "dev",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "functions-nodejs-extensions",
+            "url": "https://github.com/Azure/azure-functions-nodejs-extensions",
+            "branch": "main",
+            "branch_mapping": {}
+        },        
+        {
+            "path_to_root": "functions-node-sdk-bindings-blob",
+            "url": "https://github.com/Azure-Samples/azure-functions-blob-sdk-bindings-nodejs",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "functions-python-tensorflow-tutorial",
             "url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
@@ -543,7 +555,24 @@
             "branch_mapping": {}
         },        
         {
-            "path_to_root": "functions-sql-todo-sample",
+            "path_to_root": "functions-scenarios-durable-dotnet",
+            "url": "https://github.com/Azure-Samples/durable-functions-quickstart-dotnet-azd",
+            "branch": "main",
+            "branch_mapping": {}
+        },          
+        {
+            "path_to_root": "functions-scenarios-durable-typescript",
+            "url": "https://github.com/Azure-Samples/durable-functions-quickstart-typescript-azd",
+            "branch": "main",
+            "branch_mapping": {}
+        },         
+        {
+            "path_to_root": "functions-scenarios-durable-python",
+            "url": "https://github.com/Azure-Samples/durable-functions-quickstart-python-azd",
+            "branch": "main",
+            "branch_mapping": {}
+        }, 
+        {    "path_to_root": "functions-sql-todo-sample",
             "url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
             "branch": "docs-snippets",
             "branch_mapping": {}

.openpublishing.redirection.json

@@ -1,5 +1,20 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/network-watcher/network-watcher-using-open-source-tools.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-using-open-source-tools",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/network-watcher/network-watcher-intrusion-detection-open-source-tools.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-intrusion-detection-open-source-tools",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/migrate-cdn-to-front-door.md",
+      "redirect_url": "/previous-versions/azure/frontdoor/migrate-cdn-to-front-door",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/synapse-analytics/data-explorer/data-explorer-compare.md",
       "redirect_url": "/previous-versions/azure/synapse-analytics/data-explorer/data-explorer-compare",
@@ -230,7 +245,7 @@
       "redirect_url": "/azure/resiliency/quick-understand-protection-estate",
       "redirect_document_id": false
     },
-      {
+    {
       "source_path": "articles/business-continuity-center/business-continuity-center-support-matrix.md",
       "redirect_url": "/azure/resiliency/resiliency-support-matrix",
       "redirect_document_id": false
@@ -258,42 +273,27 @@
     {
       "source_path": "articles/migrate/concepts-azure-spring-apps-assessment-calculation.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/how-to-create-azure-spring-apps-assessment.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/troubleshoot-spring-boot-discovery.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/tutorial-assess-spring-boot.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/tutorial-discover-spring-boot.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/azure-functions/functions-proxies.md",
@@ -565,6 +565,81 @@
       "redirect_url": "/azure/storage/files/create-file-share",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/trusted-signing/overview.md",
+      "redirect_url": "/azure/artifact-signing/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-sign-ci-policy.md",
+      "redirect_url": "/azure/artifact-signing/how-to-sign-ci-policy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/quickstart.md",
+      "redirect_url": "/azure/artifact-signing/quickstart",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/tutorial-assign-roles.md",
+      "redirect_url": "/azure/artifact-signing/tutorial-assign-roles",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-signing-integrations.md",
+      "redirect_url": "/azure/artifact-signing/how-to-signing-integrations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-sign-history.md",
+      "redirect_url": "/azure/artifact-signing/how-to-sign-history",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-renew-identity-validation.md",
+      "redirect_url": "/azure/artifact-signing/how-to-renew-identity-validation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-device-guard-signing-service-migration.md",
+      "redirect_url": "/azure/artifact-signing/how-to-device-guard-signing-service-migration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-change-sku.md",
+      "redirect_url": "/azure/artifact-signing/how-to-change-sku",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/how-to-cert-revocation.md",
+      "redirect_url": "/azure/artifact-signing/how-to-cert-revocation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/concept-trust-models.md",
+      "redirect_url": "/azure/artifact-signing/concept-trust-models",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/concept-resources-roles.md",
+      "redirect_url": "/azure/artifact-signing/concept-resources-roles",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/concept-cert-management.md",
+      "redirect_url": "/azure/artifact-signing/concept-certificate-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/index.yml",
+      "redirect_url": "/azure/artifact-signing/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/trusted-signing/faq.yml",
+      "redirect_url": "/azure/artifact-signing/faq",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/managed-ccf/application-scenarios.md",
       "redirect_url": "/azure/confidential-ledger/managed-confidential-consortium-framework-migration",
@@ -1152,7 +1227,8 @@
     },
     {
       "source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
-      "redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes"
+      "redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
@@ -5064,6 +5140,16 @@
       "redirect_url": "/azure/role-based-access-control/quickstart-role-assignments-template",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/role-based-access-control/built-in-roles/mixed-reality.md",
+      "redirect_url": "/azure/role-based-access-control/built-in-roles",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/role-based-access-control/permissions/mixed-reality.md",
+      "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",
@@ -6294,8 +6380,7 @@
       "redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
       "redirect_document_id": false
     },
-
-    {  
+    {
       "source_path": "articles/app-service/sre-agent-overview.md",
       "redirect_url": "/azure/sre-agent/overview",
       "redirect_document_id": false
@@ -6345,21 +6430,11 @@
       "redirect_url": "/azure/iot-hub-device-update/",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/reliability/reliability-azure-container-apps.md",
-      "redirect_url": "/azure/reliability/reliability-container-apps",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/storage/container-storage/container-storage-aks-quickstart.md",
       "redirect_url": "/azure/storage/container-storage/install-container-storage-aks",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/reliability/reliability-cosmos-mongodb.md",
-      "redirect_url": "/azure/reliability/reliability-documentdb",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/communications-gateway/connectivity.md",
       "redirect_url": "/previous-versions/azure/communications-gateway/connectivity",
@@ -6549,7 +6624,7 @@
       "source_path": "articles/communications-gateway/whats-new.md",
       "redirect_url": "/previous-versions/azure/communications-gateway/whats-new",
       "redirect_document_id": false
-      },
+    },
     {
       "source_path": "articles/vpn-gateway/about-zone-redundant-vnet-gateways.md",
       "redirect_url": "/azure/reliability/reliability-virtual-network-gateway",
@@ -6559,7 +6634,41 @@
       "source_path": "articles/dns/dns-sdk.md",
       "redirect_url": "https://learn.microsoft.com/dotnet/api/overview/azure/resourcemanager.dns-readme",
       "redirect_document_id": false
-    }
-    
+    },
+    {
+      "source_path": "articles/oracle/oracle-db/exadata-vm-clusters.md",
+      "redirect_url": "/azure/oracle/oracle-db/database-overview",
+      "redirect_document_id": false
+    },
+    { 
+      "source_path": "articles/cyclecloud/how-to/ccws/register-entra-id-app.md",
+      "redirect_url": "/azure/cyclecloud/how-to/create-app-registration",
+      "redirect_document_id": false
+    },
+    { 
+      "source_path": "articles/cyclecloud/how-to/ccws/open-ondemand-add-users.md",
+      "redirect_url": "/azure/cyclecloud/how-to/ccws/configure-open-ondemand",
+      "redirect_document_id": false
+    },   
+    {
+      "source_path": "articles/reliability/reliability-health-insights.md",
+      "redirect_url": "/azure/azure-health-insights/reliability-health-insights",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/reliability/migrate-load-balancer.md",
+      "redirect_url": "/azure/reliability/reliability-load-balancer",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/nat-gateway/nat-availability-zones.md",
+      "redirect_url": "/azure/reliability/reliability-nat-gateway",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cyclecloud/how-to/collect-custom-metrics-gpu-infiniband-telegraf.md",
+      "redirect_url": "/azure/cyclecloud/how-to/monitor-cyclecloud-cluster-using-prometheus-grafana",
+      "redirect_document_id": false
+    }    
   ]
 }

CODEOWNERS

@@ -2,19 +2,19 @@
 # Each line is a file pattern followed by one or more owners.
 
 # Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
-/articles/aks @tynevi @thomps23 @jasonwhowell
-/articles/defender-for-cloud  @tynevi @thomps23 @jasonwhowell
-/articles/attestation  @tynevi @thomps23 @jasonwhowell
-/articles/confidential-ledger  @tynevi @thomps23 @jasonwhowell
-/articles/dedicated-hsm  @tynevi @thomps23 @jasonwhowell
-/articles/key-vault  @tynevi @thomps23 @jasonwhowell
-/articles/payment-hsm  @tynevi @thomps23 @jasonwhowell
-/articles/postgresql @tynevi @thomps23 @jasonwhowell
-/articles/cosmos-db @tynevi @thomps23 @jasonwhowell
-/articles/dms @tynevi @thomps23 @jasonwhowell
-/articles/mariadb @tynevi @thomps23 @jasonwhowell
-/articles/mysql @tynevi @thomps23 @jasonwhowell
-/articles/managed-instance-apache-cassandra @tynevi @thomps23 @jasonwhowell
+/articles/aks @thomps23 @jasonwhowell
+/articles/defender-for-cloud @thomps23 @jasonwhowell
+/articles/attestation @thomps23 @jasonwhowell
+/articles/confidential-ledger @thomps23 @jasonwhowell
+/articles/dedicated-hsm @thomps23 @jasonwhowell
+/articles/key-vault @thomps23 @jasonwhowell
+/articles/payment-hsm @thomps23 @jasonwhowell
+/articles/postgresql @thomps23 @jasonwhowell
+/articles/cosmos-db @thomps23 @jasonwhowell
+/articles/dms @thomps23 @jasonwhowell
+/articles/mariadb @thomps23 @jasonwhowell
+/articles/mysql @thomps23 @jasonwhowell
+/articles/managed-instance-apache-cassandra @thomps23 @jasonwhowell
 /articles/virtual-machines @jasonwhowell @thomps23
 /articles/virtual-machines-scale-sets @jasonwhowell @thomps23
 /articles/container-instances @jasonwhowell @thomps23
@@ -37,3 +37,4 @@
 /articles/quotas @jasonwhowell @thomps23
 /articles/container-registry @jasonwhowell @thomps23
 /articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners
+/articles/reliability @thomps23

articles/active-directory-b2c/aad-sspr-technical-profile.md

@@ -64,7 +64,7 @@ The **InputClaimsTransformations** element may contain a collection of **InputCl
 
 ### Output claims
 
-The Microsoft Entra SSPR protocol provider does not return any **OutputClaims**, thus there is no need to specify output claims. You can, however, include claims that aren't returned by the Microsoft Entra SSPR protocol provider as long as you set the `DefaultValue` attribute.
+The Microsoft Entra SSPR protocol provider does not return any **OutputClaims**, thus, there is no need to specify output claims. You can, however, include claims that aren't returned by the Microsoft Entra SSPR protocol provider as long as you set the `DefaultValue` attribute.
 
 The **OutputClaimsTransformations** element may contain a collection of **OutputClaimsTransformation** elements that are used to modify the output claims or generate new ones.
 

articles/active-directory-b2c/access-tokens.md

@@ -85,7 +85,7 @@ Replace the values in the query string as follows:
 
 To get a feel of how the request works, paste the request into your browser and run it. 
 
-This's the interactive part of the flow, where you take action. You're asked to complete the user flow's workflow. This might involve entering your username and password in a sign in form or any other number of steps. The steps you complete depend on how the user flow is defined.
+This is the interactive part of the flow, where you take action. You're asked to complete the user flow's workflow. This might involve entering your username and password in a sign in form or any other number of steps. The steps you complete depend on how the user flow is defined.
 
 The response with the authorization code should be similar to this example:
 

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

@@ -160,7 +160,7 @@ Content-type: application/json
 }
 ```
 
-The exact claims sent to the API depend on the information is provided by the identity provider. 'email' is always sent.
+The exact claims sent to the API depend on the information provided by the identity provider. 'email' is always sent.
 
 ### Expected response types from the web API at this step