Merge pull request #116201 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

.openpublishing.publish.config.json

@@ -439,6 +439,11 @@
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-xamarin-getting-started",
       "branch": "master"
     },
+    {
+      "path_to_root": "cosmosdb-python-sdk",
+      "url": "https://github.com/Azure/azure-sdk-for-python/",
+      "branch": "master"
+    },
     {
       "path_to_root": "cosmosdb-nodejs-get-started",
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",

.openpublishing.redirection.json

@@ -781,6 +781,11 @@
       "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-tutorial-list-entity.md",
+      "redirect_url": "/azure/cognitive-services/luis/reference-entity-list",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
       "redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
@@ -2500,12 +2505,12 @@
     },
     {
       "source_path": "articles/cosmos-db/analytics-usecases.md",
-      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/cosmos-db/analytics-solution-architectures.md",
-      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
       "redirect_document_id": false
     },
     {
@@ -2515,7 +2520,7 @@
     },
     {
       "source_path": "articles/cosmos-db/globally-distributed-transactional-analytical-storage.md",
-      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_url": "/azure/cosmos-db/analytical-store-introduction",
       "redirect_document_id": false
     },
     {
@@ -42719,7 +42724,7 @@
     {
       "source_path": "articles/application-insights/app-insights-usage-workbooks.md",
       "redirect_url": "/azure/azure-monitor/app/usage-workbooks",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/application-insights/app-insights-visual-studio-codelens.md",
@@ -52428,12 +52433,17 @@
         "source_path": "articles/sql-database/sql-database-auditing-and-threat-detection-powershell.md",
         "redirect_url": "/azure/sql-database/scripts/sql-database-auditing-and-threat-detection-powershell",
         "redirect_document_id": true
-      },
-      {
+    },
+    {
         "source_path": "articles/cdn/endpoint-multiorigin.md",
         "redirect_url": "/azure/cdn/cdn-overview",
         "redirect_document_id": false
     },
+	{
+      "source_path": "articles/azure-monitor/app/usage-workbooks.md",
+      "redirect_url": "/azure/azure-monitor/platform/workbooks-overview",
+	  "redirect_document_id": false
+	},
     {
       "source_path": "articles/batch/batch-api-basics.md",
       "redirect_url": "/azure/batch/batch-service-workflow-features",

articles/active-directory/app-provisioning/workday-attribute-reference.md

@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
 ---
 # Enable combined security information registration in Azure Active Directory
 
-Before combined registration, users registered authentication methods for Azure Multi-Factor Authentication and self-service password reset (SSPR) separately. People were confused that similar methods were used for Multi-Factor Authentication and SSPR but they had to register for both features. Now, with combined registration, users can register once and get the benefits of both Multi-Factor Authentication and SSPR.
+Before combined registration, users registered authentication methods for Azure Multi-Factor Authentication and self-service password reset (SSPR) separately. People were confused that similar methods were used for Azure Multi-Factor Authentication and SSPR but they had to register for both features. Now, with combined registration, users can register once and get the benefits of both Azure Multi-Factor Authentication and SSPR.
 
 Before enabling the new experience, review the article [Combined security information registration](concept-registration-mfa-sspr-combined.md) to ensure you understand the functionality and effects of this feature.
 
@@ -31,10 +31,10 @@ Complete these steps to enable combined registration:
 2. Go to **Azure Active Directory** > **User settings** > **Manage user feature preview settings**.
 3. Under **Users can use the combined security information registration experience**, choose to enable for a **Selected** group of users or for **All** users.
 
-   ![Enable the combined security info preview experience for All users](media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info-preview.png)
+   ![Enable the combined security info experience for users](media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info.png)
 
 > [!NOTE]
-> After you enable combined registration, users who register or confirm their phone number or mobile app through the new experience can use them for Multi-Factor Authentication and SSPR, if those methods are enabled in the Multi-Factor Authentication and SSPR policies. If you then disable this experience, users who go to the previous SSPR registration page at `https://aka.ms/ssprsetup` will be required to perform multi-factor authentication before they can access the page.
+> After you enable combined registration, users who register or confirm their phone number or mobile app through the new experience can use them for Azure Multi-Factor Authentication and SSPR, if those methods are enabled in the Azure Multi-Factor Authentication and SSPR policies. If you then disable this experience, users who go to the previous SSPR registration page at `https://aka.ms/ssprsetup` will be required to perform multi-factor authentication before they can access the page.
 
 If you have configured the Site to Zone Assignment List in Internet Explorer, the following sites have to be in the same zone:
 
@@ -52,8 +52,8 @@ For more information about creating trusted locations in Conditional Access, see
 
 The following policy applies to all selected users that attempt to register using the combined registration experience, and blocks access unless they are connecting from a location marked as trusted network.
 
-1. In the **Azure portal**, browse to **Azure Active Directory** > **Security** > **Conditional Access**
-1. Select **+ New policy**
+1. In the **Azure portal**, browse to **Azure Active Directory** > **Security** > **Conditional Access**.
+1. Select **+ New policy**.
 1. Enter a name for this policy, such as *Combined Security Info Registration on Trusted Networks*.
 1. Under **Assignments**, select **Users and groups**. Choose the users and groups you want this policy to apply to, then select **Done**.
 
@@ -65,20 +65,20 @@ The following policy applies to all selected users that attempt to register usin
     ![Create a conditional access policy to control security info registration](media/howto-registration-mfa-sspr-combined/require-registration-from-trusted-location.png)
 
 1. Under **Conditions** > **Locations**, configure the following options:
-   1. Configure **Yes**
-   1. Include **Any location**
-   1. Exclude **All trusted locations**
+   1. Configure **Yes**.
+   1. Include **Any location**.
+   1. Exclude **All trusted locations**.
 1. Select **Done** on the *Locations* window, then select **Done** on the *Conditions* window.
-1. Under **Access controls** > **Grant**, choose **Block access**, then **Select**
-1. Set **Enable policy** to **On**
-1. To finalize the policy, select **Create**
+1. Under **Access controls** > **Grant**, choose **Block access**, then **Select**.
+1. Set **Enable policy** to **On**.
+1. To finalize the policy, select **Create**.
 
 ## Next steps
 
 If you need help, see how to [troubleshoot combined security info registration](howto-registration-mfa-sspr-combined-troubleshoot.md) or learn [What is the location condition in Azure Active Directory Conditional Access?](../conditional-access/location-condition.md)
 
 To enable the features in your Azure AD tenant, see the tutorials to [enable self-service password reset](tutorial-enable-sspr.md) and [enable Azure Multi-Factor Authentication](tutorial-enable-azure-mfa.md).
 
-Learn how to [enable combined registration in your tenant](howto-registration-mfa-sspr-combined.md) or [force users to re-register authentication methods](howto-mfa-userdevicesettings.md#manage-user-authentication-options).
+Learn how to [force users to re-register authentication methods](howto-mfa-userdevicesettings.md#manage-user-authentication-options).
 
 You can also review the [available methods for Azure Multi-Factor Authentication and SSPR](concept-authentication-methods.md).

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

@@ -6,14 +6,15 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: overview
-ms.date: 05/20/2020
+ms.date: 05/21/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
 manager: daveba
 ms.reviewer: calebb
 
 ms.collection: M365-identity-device-management
+ms.custom: contperfq4
 ---
 # What is Conditional Access?
 
@@ -68,7 +69,7 @@ Common signals that Conditional Access can take in to account when making a poli
 
 ## Commonly applied policies
 
-Many organizations have common access concerns that Conditional Access policies can help with such as:
+Many organizations have [common access concerns that Conditional Access policies can help with](concept-conditional-access-policy-common.md) such as:
 
 - Requiring multi-factor authentication for users with administrative roles
 - Requiring multi-factor authentication for Azure management tasks
@@ -93,12 +94,8 @@ Customers with [Microsoft 365 Business licenses](/office365/servicedescriptions/
 
 ## Next steps
 
-[Building a Conditional Access policy piece by piece](concept-conditional-access-policies.md)
-
-To learn how to implement Conditional Access in your environment, see [Plan your Conditional Access deployment in Azure Active Directory](plan-conditional-access.md).
-
-[Learn about Identity Protection](../identity-protection/overview-v2.md)
-
-[Learn about Microsoft Cloud App Security](/cloud-app-security/what-is-cloud-app-security)
-
-[Learn about Microsoft Intune](/intune/index)
+- [Building a Conditional Access policy piece by piece](concept-conditional-access-policies.md)
+- [Plan your Conditional Access deployment](plan-conditional-access.md)
+- [Learn about Identity Protection](../identity-protection/overview-v2.md)
+- [Learn about Microsoft Cloud App Security](/cloud-app-security/what-is-cloud-app-security)
+- [Learn about Microsoft Intune](/intune/index)

articles/active-directory/authentication/media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info-preview.png

@@ -29,7 +29,7 @@ So how does your organization turn on MFA even for free, before becoming a stati
 
 Customers who are utilizing the free benefits of Azure AD can use [security defaults](../fundamentals/concept-fundamentals-security-defaults.md) to enable multi-factor authentication in their environment.
 
-## Office 365 Business Premium, E3, or E5
+## Microsoft 365 Business, E3, or E5
 
 For customers with Office 365, there are two options:
 

articles/active-directory/authentication/media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info.png

@@ -188,5 +188,5 @@ $bResponse.Results |ft
 ```
 
 ## Next steps:
-- [Create interactive reports with Azure Monitor workbooks](../../azure-monitor/app/usage-workbooks.md) 
+- [Create interactive reports with Azure Monitor workbooks](../../azure-monitor/platform/workbooks-overview.md)