Merge remote-tracking branch 'upstream/master'

Author: ninarn

.openpublishing.redirection.json

@@ -30656,6 +30656,11 @@
       "redirect_url": "/azure/active-directory/b2b/what-is-b2b",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/b2b/b2b-tutorial-bulk-invite.md",
+      "redirect_url": "/azure/active-directory/b2b/tutorial-bulk-invite",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/security/manage-personal-data-azure.md",
       "redirect_url": "/azure/security",
@@ -35400,6 +35405,11 @@
       "redirect_url": "/azure/storage/common/storage-lifecycle-management-concepts",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-enable-and-view-metrics.md",
+      "redirect_url": "/azure/storage/common/storage-metrics-in-azure-monitor",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/azure-stack/partner/azure-stack-vaas-set-up-account.md",
       "redirect_url": "/azure/azure-stack/partner/azure-stack-vaas-set-up-resources",
@@ -36905,6 +36915,11 @@
       "source_path": "articles/cognitive-services/QnAMaker/How-To/publish-knowledge-base.md",
       "redirect_url": "/azure/cognitive-services/QnAMaker/quickstarts/create-publish-knowledge-base",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-hier-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-entity-roles",
+      "redirect_document_id": true
     }
   ]
 }

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

@@ -23,6 +23,8 @@ Before combined registration, users registered authentication methods for Azure
 
 Before enabling the new experience, review this administrator-focused documentation and the user-focused documentation to ensure you understand the functionality and effect of this feature. Base your training on the user documentation to prepare your users for the new experience and help to ensure a successful rollout.
 
+Azure AD combined security information registration is not currently available to national clouds like Azure US Government, Azure Germany, or Azure China 21Vianet.
+
 |     |
 | --- |
 | Combined security information registration for Multi-Factor Authentication and Azure Active Directory (Azure AD) self-service password reset is a public preview feature of Azure AD. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).|

articles/active-directory/authentication/howto-mfaserver-adfs-2012.md

@@ -78,7 +78,7 @@ At this point, Multi-Factor Authentication Server is set up to be an additional
 Follow these steps to edit the MultiFactorAuthenticationAdfsAdapter.config file:
 
 1. Set the **UseWebServiceSdk** node to **true**.  
-2. Set the value for **WebServiceSdkUrl** to the URL of the Multi-Factor Authentication Web Service SDK. For example: *<https://contoso.com/&lt;certificatename&gt;/MultiFactorAuthWebServiceSdk/PfWsSdk.asmx>*, Where *certificatename* is the name of your certificate.  
+2. Set the value for **WebServiceSdkUrl** to the URL of the Multi-Factor Authentication Web Service SDK. For example: *https:\/\/contoso.com/\<certificatename>/MultiFactorAuthWebServiceSdk/PfWsSdk.asmx*, Where *\<certificatename>* is the name of your certificate.  
 3. Edit the Register-MultiFactorAuthenticationAdfsAdapter.ps1 script by adding `-ConfigurationFilePath &lt;path&gt;` to the end of the `Register-AdfsAuthenticationProvider` command, where *&lt;path&gt;* is the full path to the MultiFactorAuthenticationAdfsAdapter.config file.
 
 ### Configure the Web Service SDK with a username and password

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

@@ -151,7 +151,7 @@ In a PowerShell window, run the following command, providing the script and user
 
 To disable the preview experience for your users, complete these steps:
 
-1. Sign in to the Azure portal as a global administrator or user administrator.
+1. Sign in to the Azure portal as a user administrator.
 2. Go to **Azure Active Directory** > **User settings** > **Manage settings for access panel preview features**.
 3. Under **Users can use preview features for registering and managing security info**, set the selector to **None**, and then select **Save**.
 

articles/active-directory/authentication/howto-sspr-reporting.md

@@ -115,7 +115,7 @@ The following list explains this activity in detail:
 The following list explains this activity in detail:
 
 * **Activity description**: Indicates that an administrator performed a password reset on behalf of a user from the Azure portal.
-* **Activity actor**: The administrator who performed the password reset on behalf of another end user or administrator. Must be either a global administrator, password administrator, user administrator, or helpdesk administrator.
+* **Activity actor**: The administrator who performed the password reset on behalf of another end user or administrator. Must be a password administrator, user administrator, or helpdesk administrator.
 * **Activity target**: The user whose password was reset. The user can be an end user or a different administrator.
 * **Activity statuses**:
   * _Success_: Indicates that an admin successfully reset a user's password.

articles/active-directory/b2b/add-users-administrator.md

@@ -7,19 +7,19 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: conceptual
-ms.date: 2/6/2019
+ms.date: 04/10/2019
 
 ms.author: mimart
 author: msmimart
-manager: daveba
+manager: celested
 ms.reviewer: mal
 
 ms.collection: M365-identity-device-management
 ---
 
 # Add Azure Active Directory B2B collaboration users in the Azure portal
 
-As a global administrator, or a user who is assigned any of the limited administrator directory roles, you can use the Azure portal to invite B2B collaboration users. You can invite guest users to the directory, to a group, or to an application. After you invite a user through any of these methods, the invited user's account is added to Azure Active Directory (Azure AD), with a user type of *Guest*. The guest user must then redeem their invitation to access resources.
+As a user who is assigned any of the limited administrator directory roles, you can use the Azure portal to invite B2B collaboration users. You can invite guest users to the directory, to a group, or to an application. After you invite a user through any of these methods, the invited user's account is added to Azure Active Directory (Azure AD), with a user type of *Guest*. The guest user must then redeem their invitation to access resources.
 
 After you add a guest user to the directory, you can either send the guest user a direct link to a shared app, or the guest user can click the redemption URL in the invitation email. For more information about the redemption process, see [B2B collaboration invitation redemption](redemption-experience.md).
 
@@ -30,7 +30,7 @@ After you add a guest user to the directory, you can either send the guest user
 
 To add B2B collaboration users to the directory, follow these steps:
 
-1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
+1. Sign in to the [Azure portal](https://portal.azure.com) as a user who is assigned any of the limited administrator directory roles.
 2. In the navigation pane, select **Azure Active Directory**.
 3. Under **Manage**, select **Users**.
 4. Select **New guest user**.

articles/active-directory/b2b/b2b-tutorial-bulk-invite.md

@@ -6,11 +6,11 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: tutorial
-ms.date: 06/25/2018
+ms.date: 04/10/2019
 
 ms.author: mimart
 author: msmimart
-manager: daveba
+manager: celested
 ms.reviewer: mal
 ms.custom: "it-pro, seo-update-azuread-jan"
 ms.collection: M365-identity-device-management
@@ -69,7 +69,7 @@ To complete the scenario in this tutorial, you need:
 3.	Sign out.
 
 ## Create a conditional access policy that requires MFA
-1.	Sign in to your [Azure portal](https://portal.azure.com/) as global administrator, security administrator, or a conditional access administrator.
+1.	Sign in to your [Azure portal](https://portal.azure.com/) as a security administrator or a conditional access administrator.
 2.	In the Azure portal, select **Azure Active Directory**. 
 3.	On the **Azure Active Directory** page, in the **Security** section, select **Conditional access**.
 4.	On the **Conditional Access** page, in the toolbar on the top, select **New policy**.

articles/active-directory/b2b/b2b-tutorial-require-mfa.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: reference
-ms.date: 04/02/2019
+ms.date: 04/10/2019
 
 ms.author: mimart
 author: msmimart
@@ -51,7 +51,7 @@ Yes. Guest objects aren't visible in your organization's global address list (GA
 Absolutely. For more information, see [Adding guest users to a role](add-guest-to-role.md).
 
 ### Does Azure AD B2B collaboration allow B2B users to access the Azure portal?
-Unless a user is assigned the role of limited administrator or global administrator, B2B collaboration users won't require access to the Azure portal. However, B2B collaboration users who are assigned the role of limited administrator or global administrator can access the portal. Also, if a guest user who isn't assigned one of these admin roles accesses the portal, the user might be able to access certain parts of the experience. The guest user role has some permissions in the directory.
+Unless a user is assigned the role of limited administrator, B2B collaboration users won't require access to the Azure portal. However, B2B collaboration users who are assigned the role of limited administrator can access the portal. Also, if a guest user who isn't assigned one of these admin roles accesses the portal, the user might be able to access certain parts of the experience. The guest user role has some permissions in the directory.
 
 ### Can I block access to the Azure portal for guest users?
 Yes! When you configure this policy, be careful to avoid accidentally blocking access to members and admins.