conflict

Author: markingmyname

.openpublishing.publish.config.json

@@ -913,6 +913,12 @@
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-cache-redis-samples",
+      "url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.active-directory.json

@@ -75,6 +75,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -4405,7 +4410,7 @@
       "source_path_from_root": "/articles/active-directory/reports-monitoring/recommendations-integrate-third-party-apps.md",
       "redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
       "redirect_document_id": false
-     },
+    },
     {
       "source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
       "redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",

.openpublishing.redirection.azure-monitor.json

@@ -35,6 +35,21 @@
             "redirect_url": "/azure/azure-monitor/change/change-analysis",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/resource-manager-function-app.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-function-app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/web-app-extension-release-notes.md",
+            "redirect_url": "/azure/azure-monitor/app/azure-web-apps",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/visual-studio.md",
             "redirect_url": "https://learn.microsoft.com/visualstudio/azure/azure-app-insights-add-connected-service",

.openpublishing.redirection.azure-percept.json

@@ -362,7 +362,7 @@
         href: identity-provider-microsoft-account.md
       - name: Mobile ID
         href: identity-provider-mobile-id.md
-      - name: PingOne (PingIdentity)
+      - name: PingOne (Ping Identity)
         href: identity-provider-ping-one.md
         displayName: Ping identity
       - name: QQ

.openpublishing.redirection.healthcare-apis.json

@@ -44,7 +44,7 @@ You typically use only one identity provider in your applications, but you have
 * [LinkedIn](identity-provider-linkedin.md)
 * [Microsoft Account](identity-provider-microsoft-account.md)
 * [Mobile ID](identity-provider-mobile-id.md)
-* [PingOne](identity-provider-ping-one.md) (PingIdentity)
+* [PingOne](identity-provider-ping-one.md) (Ping Identity)
 * [QQ](identity-provider-qq.md)
 * [Salesforce](identity-provider-salesforce.md)
 * [Salesforce (SAML protocol)](identity-provider-salesforce-saml.md)

.openpublishing.redirection.json

@@ -58,17 +58,8 @@ The following locations are in the process of being added to the list. For now,
 
 ## EU Data Boundary
 
-The EU Data Boundary is Microsoft's commitment for our public sector and commercial customers in the EU and EFTA to process and store their customer data in the EU.  
-
-### Services temporarily excluded from the EU Data Boundary
-
-Some services have work in progress to be EU Data Boundary compliant, but this work is delayed beyond January 1, 2023. The services listed will become compliant over the coming months. The following details explain the customer data that these features currently transfer out of the EU Data Boundary as part of their service operations:
-
-* **Reason for customer data egress** - These features haven't completed changes to fully process admin actions and user sign-in actions within the EU Data Boundary.
-* **Types of customer data being egressed** - User account and usage data, and service configuration such as policy.
-* **Customer data location at rest** - In the EU Data Boundary.
-* **Customer data processing** - Some processing may occur globally.
-* **Services** - Administrator actions in the Azure portal or APIs, and User Sign-In Service
+> [!IMPORTANT]
+> For comprehensive details about Microsoft's EU Data Boundary commitment, see [Microsoft's EU Data Boundary documentation](https://learn.microsoft.com/privacy/eudb/eu-data-boundary-learn).
 
 ## Remote profile solution
 
@@ -80,4 +71,4 @@ After sign-up, profile editing, or sign-in is complete, Azure AD B2C includes th
 
 ## Next steps
 
-- [Create an Azure AD B2C tenant](tutorial-create-tenant.md).
+- [Create an Azure AD B2C tenant](tutorial-create-tenant.md).

articles/active-directory-b2c/TOC.yml

@@ -27,9 +27,9 @@ zone_pivot_groups: b2c-policy-type
 
 ## Create a PingOne application
 
-To enable sign-in for users with a PingOne (PingIdentity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in PingIdentity Administrator Console. For more information, see [Add or update an OIDC application](https://docs.pingidentity.com/bundle/pingoneforenterprise/page/agd1564020501024-1.html). If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
+To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. For more information, see [Adding or updating an OIDC application](https://docs.pingidentity.com/access/sources/dita/topic?resourceid=p14e_add_update_oidc_application) in the Ping Identity documentation. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
 
-1. Sign in to the PingIdentity Administrator Console with your PingOne account credentials.
+1. Sign in to the Ping Identity Administrator Console with your PingOne account credentials.
 1. In the left menu of the page, select **Connections**, then next to **Applications**, select **+**.
 1. On the **New Application** page, select **web app**, then under **OIDC**, select **Configure**.
 1. Enter an **Application name**, and select **Next**.