Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into overview-rewrite

Author: eross-msft

articles/active-directory-b2c/active-directory-b2c-tutorials-web-app.md

@@ -90,7 +90,7 @@ Update the settings in the Web.config file to work with your user flow:
 1. In the **TaskWebApp** project, open the **Web.config** file.
     1. Update the value of `ida:Tenant` and `ida:AadInstance` with the name of the Azure AD B2C tenant that you created. For example, replace `fabrikamb2c` with `contoso`.
     1. Replace the value of `ida:ClientId` with the application ID that you recorded.
-    1. Replace the value of `ida:ClientSecret` with the key that you recorded. You must XML-encode the client secret before adding it to your Web.config.
+    1. Replace the value of `ida:ClientSecret` with the key that you recorded. If the client secret contains any predefined XML entities, for example less than (`<`), greater than (`>`), ampersand (`&`), or double quote (`"`), you must escape those characters by XML-encoding the client secret before adding it to your Web.config.
     1. Replace the value of `ida:SignUpSignInPolicyId` with `b2c_1_signupsignin1`.
     1. Replace the value of `ida:EditProfilePolicyId` with `b2c_1_profileediting1`.
     1. Replace the value of `ida:ResetPasswordPolicyId` with `b2c_1_passwordreset1`.

articles/active-directory/authentication/howto-mfa-nps-extension-rdg.md

@@ -117,11 +117,11 @@ This section provides instructions for configuring RDS infrastructure to use Azu
 As part of the configuration of the NPS extension, you need to supply admin credentials and the Azure AD ID for your Azure AD tenant. The following steps show you how to get the tenant ID.
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as the global administrator of the Azure tenant.
-1. In the left navigation, select the **Azure Active Directory** icon.
+1. In the Azure portal menu, select **Azure Active Directory**, or search for and select **Azure Active Directory** from any page.
 1. Select **Properties**.
 1. In the Properties blade, beside the Directory ID, click the **Copy** icon, as shown below, to copy the ID to clipboard.
 
-   ![Getting the Directory ID from the Azure portal](./media/howto-mfa-nps-extension-rdg/image1.png)
+   ![Getting the Directory ID from the Azure portal](./media/howto-mfa-nps-extension-rdg/azure-active-directory-id-in-azure-portal.png)
 
 ### Install the NPS extension
 

articles/active-directory/authentication/howto-mfa-nps-extension-vpn.md

@@ -323,13 +323,13 @@ As part of the configuration of the NPS extension, you must supply administrator
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as the global administrator of the Azure tenant.
 
-2. In the left pane, select the **Azure Active Directory** button.
+2. In the Azure portal menu, select **Azure Active Directory**, or search for and select **Azure Active Directory** from any page.
 
 3. Select **Properties**.
 
 4. To copy your Azure AD ID, select the **Copy** button.
 
-    ![Azure AD Directory ID in the Azure portal](./media/howto-mfa-nps-extension-vpn/image35.png)
+    ![Azure AD Directory ID in the Azure portal](./media/howto-mfa-nps-extension-vpn/azure-active-directory-id-in-azure-portal.png)
 
 ### Install the NPS extension
 

articles/active-directory/authentication/howto-mfa-userdevicesettings.md

@@ -27,7 +27,7 @@ As an administrator, you can manage the following user and device settings:
 
 As an administrator assigned the Authentication Administrator role you can require users to reset their password, re-register for MFA, or revoke existing MFA sessions from their user object.
 
-![Manage authentication methods from the Azure portal](./media/howto-mfa-userdevicesettings/manage-authentication-methods.png)
+![Manage authentication methods from the Azure portal](./media/howto-mfa-userdevicesettings/manage-authentication-methods-in-azure.png)
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. On the left, select **Azure Active Directory** > **Users** > **All users**.

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

@@ -37,9 +37,9 @@ Complete these steps to enable combined registration:
 
 1. Sign in to the Azure portal as a user administrator or global 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 - refresh**, choose to enable for a **Selected** group of users or for **All** users.
+3. Under **Users can use preview features for registering and managing security info**, 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/combined-security-info-enable.png)
+   ![Enable the combined security info preview experience for All users](media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info-preview.png)
 
 > [!IMPORTANT]
 > Starting in March 2019, the phone call options won't be available to Multi-Factor Authentication and SSPR users in free/trial Azure AD tenants. SMS messages are not affected by this change. The phone call options will still be available to users in paid Azure AD tenants.
@@ -61,7 +61,7 @@ Securing when and how users register for Azure Multi-Factor Authentication and s
 
 The following policy applies to all selected users, who attempt to register using the combined registration experience, and blocks access unless they are connecting from a location marked as trusted network.
 
-![Create a CA policy to control security info registration](media/howto-registration-mfa-sspr-combined/conditional-access-register-security-info.png)
+![Create a CA policy to control security info registration](media/howto-registration-mfa-sspr-combined/require-registration-from-trusted-location.png)
 
 1. In the **Azure portal**, browse to **Azure Active Directory** > **Conditional Access**
 1. Select **New policy**