fix conflicts

Author: David Curwin

.gitattributes

@@ -6,6 +6,9 @@
 *.c text
 *.h text
 
+# Include Markdown in the GitHub language breakdown statistics
+*.md linguist-detectable
+
 # Denote all files that are truly binary and should not be modified.
 *.gif   binary
 *.ico   binary

.openpublishing.publish.config.json

@@ -905,7 +905,7 @@
     {
       "path_to_root": "ms-identity-python-webapp-tutorial",
       "url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
-      "branch": "0.5.0",
+      "branch": "0.6.0",
       "branch_mapping": {}
     },
     {

.openpublishing.redirection.active-directory.json

@@ -12450,6 +12450,31 @@
       "source_path_from_root": "/articles/active-directory/hybrid/whatis-phs.md",
       "redirect_url": "/azure/active-directory/hybrid/connect/whatis-phs",
       "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/privileged-identity-management/azure-ad-pim-approval-workflow.md",
+        "redirect_url": "/azure/active-directory/privileged-identity-management/pim-approval-workflow",
+        "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review.md",
+        "redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-roles-and-resource-roles-review",
+        "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-perform-azure-ad-roles-and-resource-roles-review.md",
+        "redirect_url": "/azure/active-directory/privileged-identity-management/pim-perform-roles-and-resource-roles-review",
+        "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-complete-azure-ad-roles-and-resource-roles-review.md",
+        "redirect_url": "/azure/active-directory/privileged-identity-management/pim-complete-roles-and-resource-roles-review",
+        "redirect_document_id": false
       }
+
   ]
 }

.openpublishing.redirection.app-service.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/app-service/scenario-secure-app-authentication-app-service-as-user.md",
+      "redirect_url": "/azure/app-service/scenario-secure-app-authentication-app-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/deploy-resource-manager-template.md",
+      "redirect_url": "/azure/app-service/quickstart-arm-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/deploy-complex-application-predictably.md",
+      "redirect_url": "/azure/app-service/quickstart-arm-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/quickstart-html.md",
+      "redirect_url": "/azure/static-web-apps/get-started-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/quickstart-html-uiex.md",
+      "redirect_url": "/azure/static-web-apps/get-started-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
       "redirect_url": "/azure/app-service/manage-backup",

.openpublishing.redirection.json

@@ -1593,6 +1593,12 @@
             "redirect_url": "/azure/frontdoor/how-to-configure-origin",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/frontdoor/front-door-application-security.md",
+            "redirect_url": "/azure/frontdoor/web-application-firewall",
+            "redirect_document_id": false
+        },
+
         {
             "source_path_from_root": "/articles/aks/aks-resource-health.md",
             "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
@@ -7843,6 +7849,11 @@
             "redirect_url": "/azure/azure-maps/how-to-creator-feature-stateset",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-maps/how-to-request-elevation-data.md",
+            "redirect_url": "https://azure.microsoft.com/updates/azure-maps-elevation-apis-and-render-v2-dem-tiles-will-be-retired-on-5-may-2023",
+            "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",
@@ -17418,6 +17429,11 @@
             "redirect_url": "/azure/virtual-network/virtual-networks-using-network-configuration-file",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/virtual-network-manager/how-to-exclude-elements.md",
+            "redirect_url": "/azure/virtual-network-manager/how-to-define-network-group-membership-azure-policy",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/networking/virtual-network-test-latency.md",
             "redirect_url": "/azure/virtual-network/virtual-network-test-latency",
@@ -22722,6 +22738,11 @@
             "source_path_from_root": "/articles/synapse-analytics/synapse-link/troubleshoot/troubleshoot-sql-snapshot-primary-key-column-order.md",
             "redirect_url": "/azure/synapse-analytics/synapse-link/synapse-link-for-sql-known-issues",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/authentication/how-to-migrate-mfa-server-to-azure-mfa-user-authentication.md",
+            "redirect_url": "/azure/active-directory/authentication/how-to-migrate-mfa-server-to-mfa-user-authentication",
+            "redirect_document_id": true
         }
 
     ]

.openpublishing.redirection.virtual-desktop.json

@@ -174,6 +174,16 @@
             "source_path_from_root": "/articles/virtual-desktop/environment-setup.md",
             "redirect_url": "/azure/virtual-desktop/terminology",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/app-attach-image-prep.md",
+            "redirect_url": "/azure/virtual-desktop/msix-app-attach-create-msix-image",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/app-attach-msixmgr.md",
+            "redirect_url": "/azure/virtual-desktop/msix-app-attach-create-msix-image",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -500,6 +500,9 @@
     # Secure
   - name: Secure
     items:
+      - name: Security overview
+        href: security-architecture.md
+        displayName: azure ad b2c security best practices
       - name: Enable MFA
         items:
         - name: Multi-factor authentication

articles/active-directory-b2c/configure-authentication-sample-python-web-app.md

@@ -71,7 +71,7 @@ To create the web app registration, follow these steps:
 
 ## Step 3: Get the web app sample
 
-[Download the zip file](https://github.com/Azure-Samples/ms-identity-python-webapp/archive/master.zip), or clone the sample web application from GitHub. 
+[Download the zip file](https://github.com/Azure-Samples/ms-identity-python-webapp/archive/main.zip), or clone the sample web application from GitHub. 
 
 ```bash
 git clone https://github.com/Azure-Samples/ms-identity-python-webapp.git

articles/active-directory-b2c/identity-provider-microsoft-account.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/13/2023
+ms.date: 05/01/2023
 ms.custom: project-no-code
 ms.author: godonnell
 ms.subservice: B2C
@@ -30,14 +30,6 @@ zone_pivot_groups: b2c-policy-type
 
 [!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
 
-### Verify the application's publisher domain
-As of November 2020, new application registrations show up as unverified in the user consent prompt unless [the application's publisher domain is verified](../active-directory/develop/howto-configure-publisher-domain.md) ***and*** the company’s identity has been verified with the Microsoft Partner Network and associated with the application. ([Learn more](../active-directory/develop/publisher-verification-overview.md) about this change.) Note that for Azure AD B2C user flows, the publisher’s domain appears only when using a Microsoft account or other [Azure AD](../active-directory-b2c/identity-provider-azure-ad-single-tenant.md) tenant as the identity provider. To meet these new requirements, do the following:
-
-1. [Verify your company identity using your Microsoft Partner Network (MPN) account](/partner-center/verification-responses). This process verifies information about your company and your company’s primary contact.
-1. Complete the publisher verification process to associate your MPN account with your app registration using one of the following options:
-   - If the app registration for the Microsoft account identity provider is in an Azure AD tenant, [verify your app in the App Registration portal](../active-directory/develop/mark-app-as-publisher-verified.md).
-   - If your app registration for the Microsoft account identity provider is in an Azure AD B2C tenant, [mark your app as publisher verified using Microsoft Graph APIs](../active-directory/develop/troubleshoot-publisher-verification.md#making-microsoft-graph-api-calls) (for example, using Graph Explorer). The UI for setting an app’s verified publisher is currently disabled for Azure AD B2C tenants.
-
 ## Create a Microsoft account application
 
 To enable sign-in for users with a Microsoft account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in [Azure portal](https://portal.azure.com). For more information, see [Register an application with the Microsoft identity platform](../active-directory/develop/quickstart-register-app.md). If you don't already have a Microsoft account, you can get one at [https://www.live.com/](https://www.live.com/).
@@ -209,4 +201,4 @@ You've now configured your policy so that Azure AD B2C knows how to communicate
 
 If the sign-in process is successful, your browser is redirected to `https://jwt.ms`, which displays the contents of the token returned by Azure AD B2C.
 
-::: zone-end
+::: zone-end

articles/active-directory-b2c/integrate-with-app-code-samples.md

@@ -1,5 +1,5 @@
 ---
-title: Azure Active Directory B2C integrate with app samples
+title: Azure Active Directory B2C integrates with app samples
 description: Code samples for integrating Azure AD B2C to mobile, desktop, web, and single-page applications.
 services: active-directory-b2c
 author: garrodonnell
@@ -26,7 +26,7 @@ The following tables provide links to samples for applications including iOS, An
 | [dotnetcore-webapp-msal-api](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/4-WebApp-your-API/4-2-B2C) | An ASP.NET Core web application that can sign in a user using Azure AD B2C, get an access token using MSAL.NET and call an API. |
 | [auth-code-flow-nodejs](https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-in-sign-out-webapp) | A Node.js app that shows how to enable authentication (sign in, sign out and profile edit) in a Node.js web application using Azure Active Directory B2C. The web app uses MSAL-node.|
 | [javascript-nodejs-webapi](https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi) | A small Node.js Web API for Azure AD B2C that shows how to protect your web api and accept B2C access tokens using passport.js. |
-| [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp/blob/master/README_B2C.md) | Demonstrate how to Integrate B2C of Microsoft identity platform with a Python web application.  |
+| [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp/blob/main/README_B2C.md) | Demonstrate how to Integrate B2C of Microsoft identity platform with a Python web application.  |
 
 ## Single page apps