MergeConflictFix

Author: MicrosoftGuyJFlo

.openpublishing.publish.config.json

@@ -974,12 +974,90 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-javascript-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-python-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-mongodb-dotnet-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-mongodb-javascript-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-mongodb-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-mongodb-python-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-mongodb-python-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-apache-cassandra-dotnet-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-dotnet-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-apache-cassandra-javascript-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-apache-cassandra-python-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-python-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-apache-gremlin-dotnet-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-dotnet-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-apache-gremlin-javascript-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-apache-gremlin-python-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-python-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-table-dotnet-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-table-dotnet-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-table-javascript-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-table-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-table-python-samples",
+      "url": "https://github.com/azure-samples/cosmos-db-table-python-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-cosmos-db-table-dotnet-v12",
       "url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",

.openpublishing.redirection.active-directory.json

@@ -3070,6 +3070,11 @@
       "redirect_url": "/azure/active-directory/conditional-access/concept-condition-filters-for-devices",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/conditional-access/policy-migration.md",
+      "redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/conditional-access/best-practices.md",
       "redirect_url": "/azure/active-directory/conditional-access/overview",
@@ -3088,7 +3093,7 @@
     {
       "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-migration-mfa.md",
       "redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-policy-connected-applications.md",

.openpublishing.redirection.api-management.json

@@ -1,5 +1,50 @@
 {
   "redirections": [
+    {
+        "source_path_from_root": "/articles/api-management/powershell-samples.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-add-user-and-get-subscription-key.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-create-apim-service.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-backup-restore-apim-service.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-scale-and-addregion-apim-service.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-setup-custom-domain.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-import-api-and-add-to-product.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-secure-backend-with-mutual-certificate-authentication.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/scripts/powershell-setup-rate-limit-policy.md",
+        "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
+        "redirect_document_id": false
+    },
     {
         "source_path_from_root": "/articles/api-management/policies/authorize-request-using-external-authorizer.md",
         "redirect_url": "https://github.com/Azure/api-management-policy-snippets",

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

@@ -19,6 +19,11 @@
             "source_path_from_root": "/articles/aks/aks-planned-maintenance-weekly-releases.md",
             "redirect_url": "/azure/aks/planned-maintenance",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/create-k8s-cluster-with-aks-application-gateway-ingress.md",
+            "redirect_url": "/azure/application-gateway/for-containers/overview",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -910,6 +910,11 @@
             "redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/databox-online/azure-stack-edge-gpu-2307-release-notes.md",
+            "redirect_url": "/azure/databox-online/azure-stack-edge-gpu-2309-release-notes",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/azure-video-analyzer/video-analyzer-docs/access-policies.md",
             "redirect_url": "/previous-versions/azure/azure-video-analyzer/video-analyzer-docs/access-policies",
@@ -22362,6 +22367,11 @@
             "redirect_url": "/azure/communication-services/how-tos/calling-sdk/lobby",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/communication-services/tutorials/widgets/click-to-call-widget.md",
+            "redirect_url": "/azure/communication-services/tutorials/calling-widget/calling-widget-overview",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/load-balancer/tutorial-load-balancer-standard-manage-portal.md",
             "redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
@@ -23591,8 +23601,32 @@
             "source_path_from_root": "/articles/devtest-labs/how-to-move-schedule-to-new-region.md",
             "redirect_url": "/azure/devtest-labs/how-to-move-labs",
             "redirect_document_id": false
+        },       
+        {
+            "source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-prescriptive-adoption.md",
+            "redirect_url": "/azure/devtest-labs/deliver-proof-of-concept",
+            "redirect_document_id": false
+        },        
+        {
+            "source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-orchestrate-implementation.md",
+            "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-scale",
+            "redirect_document_id": false
+        },        
+        {
+            "source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-cost-ownership.md",
+            "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-policy-compliance.md",
+            "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
+            "redirect_document_id": false
         },
         {
+            "source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-application-migration-integration.md",
+            "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
+            "redirect_document_id": false
+        },        {
             "source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
             "redirect_url": "/azure/advisor/advisor-overview",
             "redirect_document_id": false
@@ -24491,6 +24525,14 @@
             "source_path_from_root": "/articles/aks/command-invoke.md",
             "redirect_url": "/azure/aks/access-private-cluster",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/orbital/space-partner-program-overview.md",
+            "redirect_url": "/azure/orbital/overview",
+            "redirect_document_id": false
         }
+
+
+        
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -65,7 +65,7 @@
   items:
   - name: Compare solutions for External Identities
     href: ../active-directory/external-identities/external-identities-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
-  - name: Supported Azure AD features
+  - name: Supported Microsoft Entra features
     href: supported-azure-ad-features.md
   - name: Learn authentication basics
     items:
@@ -156,7 +156,7 @@
         href: microsoft-graph-get-started.md
       - name: Register a SAML application
         href: saml-service-provider.md?tabs=windows&pivots=b2c-custom-policy 
-      - name: Publish app in Azure AD app gallery
+      - name: Publish app in Microsoft Entra app gallery
         href: publish-app-to-azure-ad-app-gallery.md  
     - name: Create a user flow or custom policy
       items:
@@ -334,9 +334,9 @@
         href: identity-provider-amazon.md
       - name: Apple
         href: identity-provider-apple-id.md 
-      - name: Azure AD (single tenant)
+      - name: Microsoft Entra ID (single tenant)
         href: identity-provider-azure-ad-single-tenant.md
-      - name: Azure AD (multitenant)
+      - name: Microsoft Entra ID (multitenant)
         href: identity-provider-azure-ad-multi-tenant.md
       - name: Azure AD B2C
         href: identity-provider-azure-ad-b2c.md
@@ -509,7 +509,7 @@
         displayName: azure ad b2c security best practices
       - name: Enable MFA
         items:
-        - name: Multi-factor authentication
+        - name: Multifactor authentication
           href: multi-factor-authentication.md
           displayName: TOTP, multi-factor, multifactor, time-based-one-time password, time-based one-time password, authenticator app, Microsoft authenticator app, mfa, 2fa
         - name: Secure phone-based MFA
@@ -722,12 +722,12 @@
         items:
         - name: About validation technical profiles
           href: validation-technical-profile.md
-        - name: Azure Active Directory
+        - name: Microsoft Entra ID
           href: active-directory-technical-profile.md
-        - name: Azure AD Multi-Factor Authentication
+        - name: Microsoft Entra multifactor authentication
           href: multi-factor-auth-technical-profile.md
           displayName: mfa
-        - name: Azure AD SSPR
+        - name: Microsoft Entra SSPR
           href: aad-sspr-technical-profile.md
         - name: Claims transformation
           href: claims-transformation-technical-profile.md