Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

.openpublishing.redirection.json

@@ -13520,6 +13520,11 @@
       "redirect_url": "/azure/azure-toolkit-for-intelliJ",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-vmware/reset-vsphere-credentials.md",
+      "redirect_url": "/azure/azure-vmware/rotate-cloudadmin-credentials",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-vmware/set-up-backup-server-for-azure-vmware-solution.md",
       "redirect_url": "/azure/backup/backup-azure-microsoft-azure-backup",
@@ -64855,6 +64860,11 @@
       "redirect_url": "/azure/azure-monitor/alerts/tutorial-response",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-monitor/alerts/tutorial-response.md",
+      "redirect_url": "/azure/azure-monitor/alerts/alerts-log",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-monitor/samples/cli-samples.md",
       "redirect_url": "/azure/azure-monitor//cli-samples",

articles/active-directory-b2c/add-password-reset-policy.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 03/22/2021
+ms.date: 05/11/2021
 ms.custom: project-no-code
 ms.author: mimart
 ms.subservice: B2C
@@ -57,10 +57,10 @@ To enable self-service password reset for the sign-up or sign-in user flow:
 1. Select **User flows**.
 1. Select a sign-up or sign-in user flow (of type **Recommended**) that you want to customize.
 1. Under **Settings** in the left menu, select **Properties**.
-1. Under **Password complexity**, select **Self-service password reset**.
+1. Under **Password configuration**, select **Self-service password reset**.
 1. Select **Save**.
 1. Under **Customize** in the left menu, select **Page layouts**.
-1. In the **Page Layout Version**, choose **2.1.2 - Current** or above.
+1. In the **Page Layout Version**, choose **2.1.3** or above.
 1. Select **Save**.
 
 ::: zone-end

articles/active-directory-b2c/azure-monitor.md

@@ -255,7 +255,7 @@ The workbook will display reports in the form of a dashboard.
 
 ## Create alerts
 
-Alerts are created by alert rules in Azure Monitor and can automatically run saved queries or custom log searches at regular intervals. You can create alerts based on specific performance metrics or when certain events are created, absence of an event, or a number of events are created within a particular time window. For example, alerts can be used to notify you when average number of sign-in exceeds a certain threshold. For more information, see [Create alerts](../azure-monitor/alerts/tutorial-response.md).
+Alerts are created by alert rules in Azure Monitor and can automatically run saved queries or custom log searches at regular intervals. You can create alerts based on specific performance metrics or when certain events are created, absence of an event, or a number of events are created within a particular time window. For example, alerts can be used to notify you when average number of sign-in exceeds a certain threshold. For more information, see [Create alerts](../azure-monitor/alerts/alerts-log.md).
 
 
 Use the following instructions to create a new Azure Alert, which will send an [email notification](../azure-monitor/alerts/action-groups.md#configure-notifications) whenever there is a 25% drop in the **Total Requests** compare to previous period. Alert will run every 5 minutes and look for the drop within last 24 hours windows. The alerts are created using Kusto query language.

articles/active-directory/app-provisioning/application-provisioning-log-analytics.md

@@ -91,7 +91,7 @@ AADProvisioningLogs
 
 Azure Monitor lets you configure custom alerts so that you can get notified about key events related to Provisioning. For example, you might want to receive an alert on spikes in failures. Or perhaps spikes in disables or deletes. Another example of where you might want to be alerted is a lack of any provisioning, which indicates something is wrong.
 
-To learn more about alerts, see [Respond to events with Azure Monitor Alerts](../../azure-monitor/alerts/tutorial-response.md).
+To learn more about alerts, see [Azure Monitor Log Alerts](../../azure-monitor/alerts/alerts-log.md).
 
 Alert when there's a spike in failures. Replace the jobID with the jobID for your application.
 

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

@@ -35,6 +35,8 @@ Administrators can assign a Conditional Access policy to the following cloud app
 - [Office 365](#office-365)
 - Azure Analysis Services
 - Azure DevOps
+- Azure Event Hubs
+- Azure Service Bus
 - [Azure SQL Database and Azure Synapse Analytics](../../azure-sql/database/conditional-access-configure.md)
 - Dynamics CRM Online
 - Microsoft Application Insights Analytics

articles/active-directory/develop/index.yml

@@ -1,11 +1,11 @@
 ### YamlMime:Landing
 
 title: Microsoft identity platform documentation
-summary: The Microsoft identity platform is an authentication service, open-source libraries, and application management tools. Learn to create modern, standards-based authentication solutions with our quickstarts, tutorials, and code samples. Build applications your users and customers sign in to using their Microsoft identities or social accounts, and authorize access to your APIs or Microsoft APIs like Microsoft Graph.
+summary: The Microsoft identity platform for developers is an authentication service, open-source libraries, and application management tools. Learn to create modern, standards-based authentication solutions with our quickstarts, tutorials, and code samples. Build applications your users and customers sign in to using their Microsoft identities or social accounts, and authorize access to your APIs or Microsoft APIs like Microsoft Graph.
 
 metadata:
    ms.topic: landing-page
-   ms.date: 10/07/2020
+   ms.date: 05/11/2021
    author: mmacy
    ms.author: marsma
    ms.service: active-directory
@@ -51,9 +51,11 @@ landingContent:
       - linkListType: get-started
         links:
           - text: Angular
-            url: quickstart-v2-angular.md
+            url: tutorial-v2-angular-auth-code.md
           - text: JavaScript
-            url: quickstart-v2-javascript-auth-code.md
+            url: tutorial-v2-javascript-auth-code.md
+          - text: React
+            url: tutorial-v2-react.md
   - title: Web app
     linkLists:
       - linkListType: get-started
@@ -118,13 +120,9 @@ landingContent:
             url: ../managed-identities-azure-resources/overview.md
           - text: Managed identities and Azure VMs
             url: ../managed-identities-azure-resources/how-managed-identities-work-vm.md
-  - title: New in docs
+  - title: New in identity platform docs
     linkLists:
       - linkListType: whats-new
         links:
           - text: "What's new in docs?" # 9/26/2020
             url: whats-new-docs.md
-          - text: "Microsoft Identity Web library overview" # 10/07/2020
-            url: microsoft-identity-web.md
-          - text: "Tutorial: Blazor Server" # 9/26/2020
-            url: tutorial-blazor-server.md

articles/active-directory/external-identities/invite-internal-users.md

@@ -29,7 +29,7 @@ Sending an invitation to an existing internal account lets you retain that user
 
 - **Invitation is one-way**: You can invite internal users to use B2B collaboration, but you can’t remove the B2B credentials once they’re added. To change the user back to an internal-only user, you’ll need to delete the user object and create a new one.
 
-- **Teams**: When the user accesses Teams using their external credentials, their tenant won't be available initially in the Teams tenant picker. The user can access Teams using a URL that contains the tenant context, for example: `https://team.microsoft.com/?tenantId=<TenantId>`. After that, the tenant will become available in the Teams tenant picker.
+- **Teams**: When the user accesses Teams using their external credentials, their tenant won't be available initially in the Teams tenant picker. The user can access Teams using a URL that contains the tenant context, for example: `https://teams.microsoft.com/?tenantId=<TenantId>`. After that, the tenant will become available in the Teams tenant picker.
 
 - **On-premises synced users**: For user accounts that are synced between on-premises and the cloud, the on-premises directory remains the source of authority after they’re invited to use B2B collaboration. Any changes you make to the on-premises account will sync to the cloud account, including disabling or deleting the account. Therefore, you can’t prevent the user from signing into their on-premises account while retaining their cloud account by simply deleting the on-premises account. Instead, you can set the on-premises account password to a random GUID or other unknown value.
 

articles/active-directory/saas-apps/samsung-knox-and-business-services-tutorial.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 01/27/2021
+ms.date: 05/11/2021
 ms.author: jeedes
 
 ---
@@ -33,7 +33,7 @@ To get started, you need the following items:
 
 In this tutorial, you configure and test Azure AD SSO in a test environment.
 
-* Samsung Knox and Business Services supports **SP** initiated SSO
+* Samsung Knox and Business Services supports **SP** initiated SSO.
 
 > [!NOTE]
 > Identifier of this application is a fixed string value so only one instance can be configured in one tenant.
@@ -75,7 +75,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 1. On the **Basic SAML Configuration** section, enter the values for the following fields:
 
 	* In the **Sign on URL** text box, type the URL:
-	`https://www.samsungknox.com`
+	`https://www2.samsungknox.com/en/sso/login/ad`
 	* In the **Reply URL (assertion consumer service URL)** text box, type the URL: 
 	`https://central.samsungknox.com/ams/ad/saml/acs`
 

articles/aks/csi-secrets-store-driver.md

@@ -6,7 +6,7 @@ ms.author: nickoman
 ms.service: container-service
 ms.topic: how-to 
 ms.date: 03/30/2021
-ms.custom: template-how-to
+ms.custom: template-how-to, devx-track-azurecli
 ---
 
 # Use the Secrets Store CSI Driver for Kubernetes in an Azure Kubernetes Service (AKS) cluster (preview)

articles/aks/enable-host-encryption.md

@@ -4,7 +4,7 @@ description: Learn how to configure a host-based encryption in an Azure Kubernet
 services: container-service
 ms.topic: article
 ms.date: 03/03/2021 
-ms.custom: devx-track-azurepowershell
+ms.custom: devx-track-azurepowershell, devx-track-azurecli
 
 ---