resolve conflicts

Author: mumian

.openpublishing.publish.config.json

@@ -236,6 +236,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-python-extensions",
+      "url": "https://github.com/Azure/azure-functions-python-extensions",
+      "branch": "dev",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-python-tensorflow-tutorial",
       "url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
@@ -247,7 +253,7 @@
       "url": "https://github.com/Azure-Samples/function-app-arm-templates",
       "branch": "main",
       "branch_mapping": {}
-    },    
+    },
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -1004,6 +1010,12 @@
       "branch": "docs-snippets",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-openai-extension",
+      "url": "https://github.com/Azure/azure-functions-openai-extension",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-dotnet-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
@@ -1225,6 +1237,7 @@
   "redirection_files": [
   ".openpublishing.redirection.active-directory.json",
   ".openpublishing.redirection.ansible.json",
+  ".openpublishing.redirection.api-center.json",
   ".openpublishing.redirection.api-management.json",
   ".openpublishing.redirection.app-service.json",
   ".openpublishing.redirection.asc-for-iot.json",
@@ -1342,6 +1355,7 @@
   "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
   "articles/operator-insights/.openpublishing.redirection.operator-insights.json",
   "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
+  "articles/operator-service-manager/.openpublishing.redirection.operator-service-manager.json",
   "articles/peering-service/.openpublishing.redirection.peering-service.json",
   "articles/postgresql/.openpublishing.redirection.postgresql.json",
   "articles/route-server/.openpublishing.redirection.route-server.json",

.openpublishing.redirection.api-center.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/api-center/use-vscode-extension-copilot.md",
+      "redirect_url": "/azure/api-center/use-vscode-extension",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.azure-kubernetes-service.json

@@ -451,6 +451,11 @@
             "redirect_url": "/azure/aks/create-node-pools",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/copilot/limited-access.md",
+            "redirect_url": "/azure/copilot/manage-access",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/command-invoke.md",
             "redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.azure-monitor.json

@@ -6649,6 +6649,11 @@
             "redirect_url": "/azure/azure-functions/functions-monitoring",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/resources-roles-access-control.md",
+            "redirect_url": "/azure/azure-monitor//roles-permissions-security",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
             "redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",

.openpublishing.redirection.json

@@ -690,6 +690,16 @@
             "redirect_url": "/azure/azure-maps/power-bi-visual-conversion",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-maps/migrate-from-bing-maps-web-services.md",
+            "redirect_url": "/azure/azure-maps/migrate-bing-maps-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-maps/migrate-from-bing-maps.md",
+            "redirect_url": "/azure/azure-maps/migrate-bing-maps-overview",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-portal/resource-group-portal-linked-resources.md",
             "redirect_url": "/azure/azure-portal/azure-portal-dashboards",

.openpublishing.redirection.operator-service-manager.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/operator-service-manager/how-to-use-azure-operator-service-manager-cli-extension.md",
+            "redirect_url": "/azure/operator-service-manager/concepts-about-azure-operator-service-manager-cli",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,85 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/automate-responses-with-playbooks.md#azure-logic-apps-basic-concepts",
+            "redirect_url": "/azure/sentinel/playbooks/logic-apps-playbooks",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/automate-responses-with-playbooks.md#how-to-run-a-playbook",
+            "redirect_url": "/azure/sentinel/playbooks/run-manage-playbooks",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/automate-responses-with-playbooks.md#recommended-playbooks",
+            "redirect_url": "/azure/sentinel/playbooks/playbooks-recommendations",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/authenticate-playbooks-to-sentinel.md",
+            "redirect_url": "/azure/sentinel/automation/authenticate-playbooks-to-sentinel",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/automate-responses-with-playbooks.md",
+            "redirect_url": "/azure/sentinel/automation/automate-responses-with-playbooks",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/automation.md",
+            "redirect_url": "/azure/sentinel/automation/automation",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/create-playbooks.md",
+            "redirect_url": "/azure/sentinel/automation/create-playbooks",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/create-tasks-playbook.md",
+            "redirect_url": "/azure/sentinel/automation/create-tasks-playbook",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/define-playbook-access-restrictions.md",
+            "redirect_url": "/azure/sentinel/automation/define-playbook-access-restrictions",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/logic-apps-playbooks.md",
+            "redirect_url": "/azure/sentinel/automation/logic-apps-playbooks",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/migrate-playbooks-to-automation-rules.md",
+            "redirect_url": "/azure/sentinel/automation/migrate-playbooks-to-automation-rules",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/playbook-recommendations.md",
+            "redirect_url": "/azure/sentinel/automation/playbook-recommendations",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/playbook-triggers-actions.md",
+            "redirect_url": "/azure/sentinel/automation/playbook-triggers-actions",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/run-playbooks.md",
+            "redirect_url": "/azure/sentinel/automation/run-playbooks",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/tutorial-respond-threats-playbook.md",
+            "redirect_url": "/azure/sentinel/automation/tutorial-respond-threats-playbook",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/use-playbook-templates.md",
+            "redirect_url": "/azure/sentinel/automation/use-playbook-templates",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/sentinel/sap/deploy-data-connector-agent-container-other-methods.md",
             "redirect_url": "/azure/sentinel/sap/deploy-data-connector-agent-container",

articles/active-directory-b2c/TOC.yml

@@ -535,8 +535,10 @@
             href: partner-nevis.md
           - name: Nok Nok
             href: partner-nok-nok.md
-          - name: Transmit Security
+          - name: Transmit Security for passwordless
             href: partner-bindid.md
+          - name: Transmit Security for risk detection
+            href: partner-transmit-security.md
           - name: Trusona
             href: partner-trusona.md
           - name: Twilio

articles/active-directory-b2c/media/partner-transmit-security/transmit-security-integration-diagram.png

@@ -262,11 +262,13 @@ The `RunAsync` method in the _Program.cs_ file:
 1. Initializes the auth provider using [OAuth 2.0 client credentials grant](../active-directory/develop/v2-oauth2-client-creds-grant-flow.md) flow. With the client credentials grant flow, the app is able to get an access token to call the Microsoft Graph API.
 1. Sets up the Microsoft Graph service client with the auth provider:
 
-:::code language="csharp" source="~/ms-identity-dotnetcore-b2c-account-management/src/Program.cs" id="ms_docref_set_auth_provider":::
+The previously published sample code is not available at this time.
+<!--:::code language="csharp" source="~/ms-identity-dotnetcore-b2c-account-management/src/Program.cs" id="ms_docref_set_auth_provider":::-->
 
 The initialized _GraphServiceClient_ is then used in _UserService.cs_ to perform the user management operations. For example, getting a list of the user accounts in the tenant:
 
-:::code language="csharp" source="~/ms-identity-dotnetcore-b2c-account-management/src/Services/UserService.cs" id="ms_docref_get_list_of_user_accounts":::
+The previously published sample code is not available at this time.
+<!--:::code language="csharp" source="~/ms-identity-dotnetcore-b2c-account-management/src/Services/UserService.cs" id="ms_docref_get_list_of_user_accounts":::-->
 
 [Make API calls using the Microsoft Graph SDKs](/graph/sdks/create-requests) includes information on how to read and write information from Microsoft Graph, use `$select` to control the properties returned, provide custom query parameters, and use the `$filter` and `$orderBy` query parameters.