Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into directories+subscriptions-b2c-update

Author: garrodonnell

.openpublishing.redirection.azure-monitor.json

@@ -6398,6 +6398,26 @@
             "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
         }
     ]
 }

.openpublishing.redirection.json

@@ -7928,11 +7928,6 @@
             "redirect_url": "/azure/azure-arc/vmware-vsphere/setup-and-manage-self-service-access",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-arc/vmware-vsphere/azure-arc-agent.md",
-            "redirect_url": "/azure/azure-arc/vmware-vsphere/overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-arc/vmware-vsphere/azure-arc-resource-bridge.md",
             "redirect_url": "/azure/azure-arc/vmware-vsphere/overview",
@@ -7943,11 +7938,6 @@
             "redirect_url": "/azure/azure-arc/vmware-vsphere/overview",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-arc/system-center-virtual-machine-manager/agent-overview-scvmm.md",
-            "redirect_url": "/azure/azure-arc/system-center-virtual-machine-manager/overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-arc/system-center-virtual-machine-manager/azure-arc-resource-bridge.md",
             "redirect_url": "/azure/azure-arc/system-center-virtual-machine-manager/overview",
@@ -24671,6 +24661,16 @@
             "redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/energy-data-services/reliability-energy-data-services.md",
+            "redirect_url": "/azure/reliability/reliability-energy-data-services",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/deployment-environments/concept-environments-reliability-availability.md",
+            "redirect_url": "/azure/reliability/reliability-deployment-environments",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/spring-apps/how-to-enable-redundancy-and-disaster-recovery.md",
             "redirect_url": "/azure/reliability/reliability-spring-apps",
@@ -24845,6 +24845,6 @@
             "source_path_from_root": "/articles/orbital/delete-contact.md",
 	    "redirect_url": "/azure/orbital/spacecraft-object",
             "redirect_document_id": false
-        },
+        }
     ]
 }

.openpublishing.redirection.reliability.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.virtual-desktop.json

@@ -204,6 +204,21 @@
             "source_path_from_root": "/articles/virtual-desktop/install-client-per-user.md",
             "redirect_url": "/azure/virtual-desktop/install-windows-client-per-user",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-host-pool.md",
+            "redirect_url": "/azure/virtual-desktop/deploy-azure-virtual-desktop",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-application-group-workspace.md",
+            "redirect_url": "/azure/virtual-desktop/deploy-azure-virtual-desktop",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/tutorial-create-connect-personal-desktop.md",
+            "redirect_url": "/azure/virtual-desktop/tutorial-try-deploy-windows-11-desktop",
+            "redirect_document_id": true
         }
     ]
 }

README.md

@@ -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
 

articles/active-directory-b2c/TOC.yml

@@ -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/bread/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/custom-domain.md

@@ -5,7 +5,6 @@ description: Learn how to enable custom domains in your redirect URLs for Azure
 services: active-directory-b2c
 author: kengaderdus
 manager: CelesteDG
-
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
@@ -23,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. 
 
@@ -399,6 +399,9 @@ Copy the URL, change the domain name manually, and then paste it back to your br
 
 Azure Front Door passes the user's original IP address. It's the IP address that you'll see in the audit reporting or your custom policy.
 
+> [!IMPORTANT]
+> If the client sends an `x-forwarded-for` header to Azure Front Door, Azure AD B2C will use the originator's `x-forwarded-for` as the user's IP address for [Conditional Access Evaluation](./conditional-access-identity-protection-overview.md) and the `{Context:IPAddress}` [claims resolver](./claim-resolver-overview.md).
+
 ### Can I use a third-party Web Application Firewall (WAF) with B2C?
 
 Yes, Azure AD B2C supports BYO-WAF (Bring Your Own Web Application Firewall). However, you must test WAF to ensure that it doesn't block or alert legitimate requests to Azure AD B2C user flows or custom policies. Learn how to configure [Akamai WAF](partner-akamai.md) and [Cloudflare WAF](partner-cloudflare.md) with Azure AD B2C.