Merge pull request #112237 from MicrosoftDocs/master

4/21 PM Publish

Author: huypub

.openpublishing.redirection.json

@@ -20,7 +20,7 @@
       "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
       "redirect_document_id": false
     },
-	
+
     {
       "source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
       "redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
@@ -727,6 +727,13 @@
       "redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
       "redirect_document_id": false
     },
+
+      {
+        "source_path": "articles/cognitive-services/LUIS/luis-migration-api-authoring.md",
+        "redirect_url": "/azure/cognitive-services/LUIS/luis-migration-authoring-entities",
+        "redirect_document_id": false
+      },
+
     {
       "source_path": "articles/cognitive-services/LUIS/luis-resources-faq.md",
       "redirect_url": "/azure/cognitive-services/LUIS/troubleshooting",
@@ -5291,7 +5298,7 @@
       "source_path": "articles/event-grid/event-sources.md",
       "redirect_url": "/azure/event-grid/overview#event-sources",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "articles/event-grid/event-subscription-template.md",
       "redirect_url": "/azure/event-grid/template-samples",

articles/active-directory/authentication/howto-authentication-sms-signin.md

@@ -38,7 +38,8 @@ To complete this article, you need the following resources and privileges:
 * You need *global administrator* privileges in your Azure AD tenant to enable SMS-based authentication.
 * Each user that's enabled in the text message authentication method policy must be licensed, even if they don't use it. Each enabled user must have one of the following Azure AD or Microsoft 365 licenses:
     * [Azure AD Premium P1 or P2][azuread-licensing]
-    * [Microsoft 365 F1 or F3][m365-firstline-workers-licensing]
+    * [Microsoft 365 (M365) F1 or F3][m365-firstline-workers-licensing]
+    * [Enterprise Mobility + Security (EMS) E3 or E5][ems-licensing] or [Microsoft 365 (M365) E3 or E5][m365-licensing]
 
 ## Limitations
 
@@ -159,3 +160,5 @@ For additional ways to sign in to Azure AD without a password, such as the Micro
 [office]: https://www.office.com
 [m365-firstline-workers-licensing]: https://www.microsoft.com/licensing/news/m365-firstline-workers
 [azuread-licensing]: https://azure.microsoft.com/pricing/details/active-directory/
+[ems-licensing]: https://www.microsoft.com/microsoft-365/enterprise-mobility-security/compare-plans-and-pricing
+[m365-licensing]: https://www.microsoft.com/microsoft-365/compare-microsoft-365-enterprise-plans

articles/active-directory/hybrid/reference-connect-version-history.md

@@ -8,7 +8,7 @@ ms.assetid: ef2797d7-d440-4a9a-a648-db32ad137494
 ms.service: active-directory
 ms.topic: reference
 ms.workload: identity
-ms.date: 04/20/2020
+ms.date: 04/21/2020
 ms.subservice: hybrid
 ms.author: billmath
 
@@ -61,12 +61,6 @@ This hotfix build fixes an issue with build 1.5.18.0 if you have the Group Filte
 
 > [!IMPORTANT]
 > If you have cloned the **In from AD - Group Join** sync rule and have not cloned the **In from AD - Group Common** sync rule and plan to upgrade, complete the following steps as part of the upgrade:
-> 1. During Upgrade, on the configure page, uncheck the option **Start the synchronization process when configuration completes**.
-> 2. Edit cloned join sync rule and add the following two transformations:
-    - direct flow `objectGUID` to `sourceAnchorBinary`	
-    - expression flow `ConvertToBase64([objectGUID])` to `sourceAnchor`      
-> 3. Enable the scheduler using `Set-ADSyncScheduler -SyncCycleEnabled $true`
-> If you use mS-DS-ConsistencyGuid as the source anchor, and you have cloned the **In from AD - Group Join** sync rule and plan to upgrade, complete the following steps as part of the upgrade:
 > 1. During Upgrade, uncheck the option **Start the synchronization process when configuration completes**.
 > 2. Edit the cloned join sync rule and add the following two transformations:
 >     - Set direct flow `objectGUID` to `sourceAnchorBinary`.

articles/active-directory/manage-apps/application-proxy-wildcard.md

@@ -46,8 +46,6 @@ For example: `http(s)://*.adventure-works.com`.
 
 While the internal and external URLs can use different domains, as a best practice, they should be same. When publishing the application, you see an error if one of the URLs doesn't have a wildcard.
 
-If you have additional applications with different configuration settings, you must publish these exceptions as separate applications to overwrite the defaults set for the wildcard. Applications without a wildcard do always take precedence over wildcard applications. From the configuration perspective, these are "just" regular applications.
-
 Creating a wildcard application is based on the same [application publishing flow](application-proxy-add-on-premises-application.md) that is available for all other applications. The only difference is that you include a wildcard in the URLs and potentially the SSO configuration.
 
 ## Prerequisites

articles/active-directory/saas-apps/profitco-saml-app-tutorial.md

@@ -24,10 +24,10 @@ ms.collection: M365-identity-device-management
 In this tutorial, you'll learn how to integrate Profit.co SAML App with Azure Active Directory (Azure AD). When you integrate Profit.co SAML App with Azure AD, you can:
 
 * Control in Azure AD who has access to Profit.co SAML App.
-* Enable your users to be automatically signed-in to Profit.co SAML App with their Azure AD accounts.
-* Manage your accounts in one central location - the Azure portal.
+* Enable your users to be automatically signed in to Profit.co SAML App with their Azure AD accounts.
+* Manage your accounts in one central location, the Azure portal.
 
-To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
+To learn more about software as a service (SaaS) app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
 
 ## Prerequisites
 
@@ -40,100 +40,99 @@ To get started, you need the following items:
 
 In this tutorial, you configure and test Azure AD SSO in a test environment.
 
-* Profit.co SAML App supports **IDP** initiated SSO
+* Profit.co SAML App supports IDP initiated SSO.
 
-* Once you configure Profit.co SAML App you can enforce session control, which protect exfiltration and infiltration of your organization’s sensitive data in real-time. Session control extend from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](https://docs.microsoft.com/cloud-app-security/proxy-deployment-any-app).
+* After you configure Profit.co SAML App, you can enforce session control. This protects exfiltration and infiltration of your organization's sensitive data in real time. Session control extends from conditional access. [Learn how to enforce session control with Microsoft Cloud App Security](https://docs.microsoft.com/cloud-app-security/proxy-deployment-any-app).
 
-## Adding Profit.co SAML App from the gallery
+## Add Profit.co SAML App from the gallery
 
 To configure the integration of Profit.co SAML App into Azure AD, you need to add Profit.co SAML App from the gallery to your list of managed SaaS apps.
 
-1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
+1. Sign in to the [Azure portal](https://portal.azure.com) by using either a work or school account, or a personal Microsoft account.
 1. On the left navigation pane, select the **Azure Active Directory** service.
-1. Navigate to **Enterprise Applications** and then select **All Applications**.
-1. To add new application, select **New application**.
+1. Go to **Enterprise Applications**, and then select **All Applications**.
+1. To add a new application, select **New application**.
 1. In the **Add from the gallery** section, type **Profit.co SAML App** in the search box.
-1. Select **Profit.co SAML App** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
-
+1. Select **Profit.co SAML App** from the results panel, and then add the app. Wait a few seconds while the app is added to your tenant.
 
 ## Configure and test Azure AD single sign-on for Profit.co SAML App
 
-Configure and test Azure AD SSO with Profit.co SAML App using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Profit.co SAML App.
+Configure and test Azure AD SSO with Profit.co SAML App by using a test user called **B.Simon**. For SSO to work, establish a linked relationship between an Azure AD user and the related user in Profit.co SAML App.
 
-To configure and test Azure AD SSO with Profit.co SAML App, complete the following building blocks:
+Here are the general steps to configure and test Azure AD SSO with Profit.co SAML App:
 
-1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
-    1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
-    1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
-1. **[Configure Profit.co SAML App SSO](#configure-profitco-saml-app-sso)** - to configure the single sign-on settings on application side.
-    1. **[Create Profit.co SAML App test user](#create-profitco-saml-app-test-user)** - to have a counterpart of B.Simon in Profit.co SAML App that is linked to the Azure AD representation of user.
-1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
+1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** to enable your users to use this feature.
+    1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** to test Azure AD single sign-on with B.Simon.
+    1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** to enable B.Simon to use Azure AD single sign-on.
+1. **[Configure Profit.co SAML App SSO](#configure-profitco-saml-app-sso)** to configure the single sign-on settings on the application side.
+    1. **[Create Profit.co SAML App test user](#create-a-profitco-saml-app-test-user)** to have a counterpart of B.Simon in Profit.co SAML App. This counterpart is linked to the Azure AD representation of the user.
+1. **[Test SSO](#test-sso)** to verify whether the configuration works.
 
 ## Configure Azure AD SSO
 
 Follow these steps to enable Azure AD SSO in the Azure portal.
 
-1. In the [Azure portal](https://portal.azure.com/), on the **Profit.co SAML App** application integration page, find the **Manage** section and select **single sign-on**.
+1. In the [Azure portal](https://portal.azure.com/), on the **Profit.co SAML App** application integration page, find the **Manage** section. Select **single sign-on**.
 1. On the **Select a single sign-on method** page, select **SAML**.
-1. On the **Set up single sign-on with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
+1. On the **Set up single sign-on with SAML** page, select the pencil icon for **Basic SAML Configuration** to edit the settings.
 
-   ![Edit Basic SAML Configuration](common/edit-urls.png)
+   ![Screenshot of Set up single sign-on with SAML page, with pencil icon highlighted](common/edit-urls.png)
 
-1. On the **Basic SAML Configuration** section, the application is pre-configured and the necessary URLs are already pre-populated with Azure. The user needs to save the configuration by clicking the **Save** button.
+1. In the **Basic SAML Configuration** section, the application is preconfigured and the necessary URLs are already prepopulated in Azure. Users need to save the configuration by selecting the **Save** button.
 
-1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
+1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, select the **Copy** button. This copies the **App Federation Metadata Url** and saves it on your computer.
 
-	![The Certificate download link](common/copy-metadataurl.png)
+    ![Screenshot of the SAML Signing Certificate, with the copy button highlighted](common/copy-metadataurl.png)
 
 ### Create an Azure AD test user
 
-In this section, you'll create a test user in the Azure portal called B.Simon.
+In this section, you create a test user in the Azure portal called B.Simon.
 
-1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
+1. From the left pane in the Azure portal, select **Azure Active Directory** > **Users** > **All users**.
 1. Select **New user** at the top of the screen.
 1. In the **User** properties, follow these steps:
    1. In the **Name** field, enter `B.Simon`.  
    1. In the **User name** field, enter the [email protected]. For example, `[email protected]`.
-   1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
-   1. Click **Create**.
+   1. Select the **Show password** check box, and then write down the value that's shown in the **Password** field.
+   1. Select **Create**.
 
 ### Assign the Azure AD test user
 
-In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Profit.co SAML App.
+In this section, you enable B.Simon to use Azure single sign-on by granting access to Profit.co SAML App.
 
-1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
+1. In the Azure portal, select **Enterprise Applications** > **All applications**.
 1. In the applications list, select **Profit.co SAML App**.
-1. In the app's overview page, find the **Manage** section and select **Users and groups**.
+1. In the app's overview page, find the **Manage** section, and select **Users and groups**.
 
-   ![The "Users and groups" link](common/users-groups-blade.png)
+   ![Screenshot of the Manage section, with Users and groups highlighted](common/users-groups-blade.png)
 
-1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
+1. Select **Add user**. In the **Add Assignment** dialog box, select **Users and groups**.
 
-	![The Add User link](common/add-assign-user.png)
+    ![Screenshot of Users and groups page, with Add user highlighted](common/add-assign-user.png)
 
-1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
-1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
-1. In the **Add Assignment** dialog, click the **Assign** button.
+1. In the **Users and groups** dialog box, select **B.Simon** from the users list. Then choose the **Select** button at the bottom of the screen.
+1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog box, select the appropriate role for the user from the list. Then choose the **Select** button at the bottom of the screen.
+1. In the **Add Assignment** dialog box, select **Assign**.
 
 ## Configure Profit.co SAML App SSO
 
-To configure single sign-on on **Profit.co SAML App** side, you need to send the **App Federation Metadata Url** to [Profit.co SAML App support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
+To configure single sign-on on the Profit.co SAML App side, you need to send the App Federation Metadata URL to the [Profit.co SAML App support team](mailto:[email protected]). They configure this setting to have the SAML SSO connection set properly on both sides.
 
-### Create Profit.co SAML App test user
+### Create a Profit.co SAML App test user
 
-In this section, you create a user called Britta Simon in Profit.co SAML App. Work with [Profit.co SAML App support team](mailto:[email protected]) to add the users in the Profit.co SAML App platform. Users must be created and activated before you use single sign-on.
+In this section, you create a user called B.Simon in Profit.co SAML App. Work with the [Profit.co SAML App support team](mailto:[email protected]) to add the users in the Profit.co SAML App platform. You can't use single sign-on until you create and activate users.
 
-## Test SSO 
+## Test SSO
 
-In this section, you test your Azure AD single sign-on configuration using the Access Panel.
+In this section, you test your Azure AD single sign-on configuration by using Access Panel.
 
-When you click the Profit.co SAML App tile in the Access Panel, you should be automatically signed in to the Profit.co SAML App for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
+When you select the Profit.co SAML App tile in Access Panel, you should be automatically signed in to the Profit.co SAML App for which you set up SSO. For more information, see [Introduction to Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
 
 ## Additional resources
 
-- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
+- [Tutorials for integrating SaaS applications with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
 
-- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
+- [What is application access and single sign-on with Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
 
 - [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
 
@@ -142,4 +141,3 @@ When you click the Profit.co SAML App tile in the Access Panel, you should be au
 - [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
 
 - [How to protect Profit.co SAML App with advanced visibility and controls](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
-

articles/active-directory/user-help/my-staff-team-manager.md

@@ -25,7 +25,7 @@ Managing your team members in My Staff is simple. To start, [go to My Staff](htt
 
 If you manage more than one location, when you go to My Staff you must select a location to see the team member who are assigned to the location.
 
-If you don't yet have sufficient permissions to access My Staff, you'll see the following message "Oops, seem you're not authorized to see My Staff at this time. Please contact your admin for more information."
+If you don't yet have sufficient permissions to access My Staff, you'll see the following message "Oops, seems you're not authorized to see My Staff at this time. Please contact your admin for more information."
 
 ### Find a staff member in My Staff