Merge branch 'main' into aks-assessments

Author: anraghun

.openpublishing.publish.config.json

@@ -488,12 +488,6 @@
       "branch": "v1-archive",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "azureml-examples-batch-pup",
-      "url": "https://github.com/azure/azureml-examples",
-      "branch": "santiagxf/batch-pup",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "azureml-examples-mavaisma-r-azureml",
       "url": "https://github.com/azure/azureml-examples",
@@ -506,24 +500,6 @@
       "branch": "v2samplesreorg",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "azureml-examples-sdk-preview",
-      "url": "https://github.com/azure/azureml-examples",
-      "branch": "sdk-preview",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "azureml-examples-online-endpoint-vnet",
-      "url": "https://github.com/azure/azureml-examples",
-      "branch": "main",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "azureml-examples-featurestore",
-      "url": "https://github.com/Azure/azureml-examples",
-      "branch": "featurestore/pup",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "azureml-examples-temp-fix",
       "url": "https://github.com/Azure/azureml-examples",

.openpublishing.redirection.azure-monitor.json

@@ -6398,6 +6398,31 @@
             "source_path_from_root": "/articles/azure-monitor/app/data-retention-privacy.md",
             "redirect_url": "/azure/azure-monitor/app/app-insights-overview#how-does-application-insights-handle-data-collection-retention-storage-and-privacy",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/usage-estimated-costs.md",
+            "redirect_url": "/azure/azure-monitor/cost-usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-getting-started.md",
+            "redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-dynamic-scope.md",
+            "redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-charts.md",
+            "redirect_url": "/azure/azure-monitor/essentials/analyze-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/faq.yml",
+            "redirect_url": "/azure/azure-monitor/overview#frequently-asked-questions",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -1,9 +1,5 @@
 {
   "redirections": [
-    {
-      "source_path_from_root": "/articles/reliability/reliability-energy-data-services.md",
-      "redirect_url": "/azure/energy-data-services/reliability-energy-data-services",
-      "redirect_document_id": true
-    }
+   
   ]
 }

.openpublishing.redirection.reliability.json

@@ -20,7 +20,11 @@ To install the necessary tools, follow the instructions for [Install content aut
 
 ## License
 
-Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE), and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
+For all licensing information, refer to:
+
+- [LICENSE](LICENSE)
+- [LICENSE-CODE](LICENSE-CODE)
+- [ThirdPartyNotices](ThirdPartyNotices.md)
 
 ## Code of Conduct
 

README.md

@@ -64,19 +64,19 @@
 - name: Concepts
   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
+    href: /entra/external-id/external-identities-overview?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
   - name: Supported Microsoft Entra features
     href: supported-azure-ad-features.md
   - name: Learn authentication basics
     items:
     - name: Authentication and authorization
-      href: ../active-directory/develop/authentication-vs-authorization.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/identity-platform/authentication-vs-authorization?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: Tokens
-      href: ../active-directory/develop/security-tokens.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/identity-platform/security-tokens?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: Application authentication request
-      href: ../active-directory/develop/v2-app-types.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/identity-platform/v2-app-types?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: Authentication library
-      href: ../active-directory/develop/msal-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/identity-platform/msal-overview?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
       displayName: MSAL, client library, Microsoft Authentication Library
   - name: Azure AD B2C global identity framework
     items:
@@ -798,15 +798,15 @@
   - name: Build for resilience
     items:
     - name: Azure AD B2C introduction to resilience
-      href: ../active-directory/architecture/resilience-b2c.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/architecture/resilience-b2c?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: End-user experience
-      href: ../active-directory/architecture/resilient-end-user-experience.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/architecture/resilient-end-user-experience?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: Interfaces with external processes
-      href: ../active-directory/architecture/resilient-external-processes.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/architecture/resilient-external-processes?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: Azure AD B2C developer best practices
-      href: ../active-directory/architecture/resilience-b2c-developer-best-practices.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/architecture/resilience-b2c-developer-best-practices?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     - name: Monitoring and analytics
-      href: ../active-directory/architecture/resilience-with-monitoring-alerting.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
+      href: /entra/architecture/resilience-with-monitoring-alerting?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
     displayName: security
   - name: User flow versions
     href: user-flow-versions.md
@@ -820,7 +820,7 @@
     href: ./faq.yml
     displayName: FAQ
   - name: Getting help
-    href: ../active-directory/develop/developer-support-help-options.md
+    href: /entra/identity-platform/developer-support-help-options
   - name: Pricing
     href: https://azure.microsoft.com/pricing/details/active-directory/external-identities/
   - name: Pricing calculator

articles/active-directory-b2c/TOC.yml

@@ -7,7 +7,7 @@
     topicHref: /azure/active-directory/index
     items:  
     - name: B2C
-      tocHref: /azure/active-directory/develop/
+      tocHref: /entra/identity-platform/
       topicHref: /azure/active-directory-b2c/index
 - name: Azure
   tocHref: /azure/
@@ -18,7 +18,7 @@
     topicHref: /azure/active-directory/index
     items:  
     - name: B2C
-      tocHref: /azure/active-directory/external-identities/
+      tocHref: /entra/external-id/
       topicHref: /azure/active-directory-b2c/index
 - name: Azure
   tocHref: /azure/
@@ -29,5 +29,5 @@
     topicHref: /azure/active-directory/index
     items:  
     - name: B2C
-      tocHref: /azure/active-directory/fundamentals/
+      tocHref: /entra/fundamentals/
       topicHref: /azure/active-directory-b2c/index

articles/active-directory-b2c/bread/toc.yml

@@ -22,6 +22,7 @@ zone_pivot_groups: b2c-policy-type
 This article describes how to enable custom domains in your redirect URLs for Azure Active Directory B2C (Azure AD B2C). By using a verified custom domain, you've benefits such as: 
 
 - It provides a more seamless user experience. From the user's perspective, they remain in your domain during the sign in process rather than redirecting to the Azure AD B2C default domain *<tenant-name>.b2clogin.com*.
+-  By staying in the same domain for your application during sign-in, you mitigate the impact of [third-party cookie blocking](/azure/active-directory/develop/reference-third-party-cookies-spas). 
 
 - You increase the number of objects (user accounts and applications) you can create in your Azure AD B2C tenant from the default 1.25 million to 5.25 million. 
 

articles/active-directory-b2c/custom-domain.md

@@ -376,7 +376,7 @@ As with the OTP technical profiles, add the following technical profiles to the
   <DisplayName>RestfulProvider</DisplayName>
   <TechnicalProfiles>
     <TechnicalProfile Id="sendOtp">
-      <DisplayName>Use email API to send the code the the user</DisplayName>
+      <DisplayName>Use email API to send the code to the user</DisplayName>
       <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.RestfulProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       <Metadata>
         <Item Key="ServiceUrl">https://api.mailjet.com/v3.1/send</Item>

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

@@ -365,7 +365,7 @@ As with the OTP technical profiles, add the following technical profiles to the
   <DisplayName>RestfulProvider</DisplayName>
   <TechnicalProfiles>
     <TechnicalProfile Id="SendOtp">
-      <DisplayName>Use SendGrid's email API to send the code the the user</DisplayName>
+      <DisplayName>Use SendGrid's email API to send the code to the user</DisplayName>
       <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.RestfulProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       <Metadata>
         <Item Key="ServiceUrl">https://api.sendgrid.com/v3/mail/send</Item>