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

Author: cherylmc

articles/api-management/api-management-howto-aad-b2c.md

@@ -56,7 +56,7 @@ Azure Active Directory B2C is a cloud identity management solution for consumer-
 
    ![Register a new application 3][api-management-howto-aad-b2c-app-details]
 
-1. If you're using the new developer portal (not the legacy developer portal), include the **Given Name**, **Surname**, and **User's Object Id** in the application claims.
+1. If you're using the new developer portal (not the legacy developer portal), include the **Given Name**, **Surname**, and **User's Object ID** in the application claims.
 
     ![Application claims](./media/api-management-howto-aad-b2c/api-management-application-claims.png)
 
@@ -88,12 +88,12 @@ Azure Active Directory B2C is a cloud identity management solution for consumer-
 
 ## Developer portal - add Azure AD B2C account authentication
 
-In the developer portal, sign-in with AAD B2C is possible with the **OAuth buttons** widget. The widget is already included on the sign-in page of the default developer portal content.
-
-![AAD buttons widget](./media/api-management-howto-aad/portal-oauth-widget.png)
+In the developer portal, sign-in with AAD B2C is possible with the **Sign-in button: OAuth** widget. The widget is already included on the sign-in page of the default developer portal content.
 
 Although a new account will be automatically created whenever a new user signs in with AAD B2C, you may consider adding the same widget to the sign-up page.
 
+The **Sign-up form: OAuth** widget represents a form used for signing up with OAuth.
+
 > [!IMPORTANT]
 > You need to [republish the portal](api-management-howto-developer-portal-customize.md#publish) for the AAD changes to take effect.
 

articles/api-management/api-management-howto-aad.md

@@ -49,10 +49,10 @@ This article shows you how to enable access to the developer portal for users fr
 12. Under **Manage**, select **App registrations**.
 13. Select **New registration**. On the **Register an application** page, set the values as follows:
 
-* Set **Name** to a meaningful name. e.g., *developer-portal*
-* Set **Supported account types** to **Accounts in this organizational directory only**. 
-* Set **Redirect URI** to the value you got from step 9. 
-* Choose **Register**. 
+    * Set **Name** to a meaningful name. e.g., *developer-portal*
+    * Set **Supported account types** to **Accounts in this organizational directory only**. 
+    * Set **Redirect URI** to the value you got from step 9. 
+    * Choose **Register**. 
 
 14.  After the application is registered, copy the **Application (client) ID** from the **Overview** page. 
 15. Go back to your API Management instance. In the **Add identity provider** window, paste the **Application (client) ID** value into the **Client ID** box.
@@ -67,11 +67,11 @@ This article shows you how to enable access to the developer portal for users fr
 
 19. The **Add identity provider** window also contains the **Allowed Tenants** text box. There, specify the domains of the Azure AD instances to which you want to grant access to the APIs of the API Management service instance. You can separate multiple domains with newlines, spaces, or commas.
 
-> [!NOTE]
-> You can specify multiple domains in the **Allowed Tenants** section. Before any user can sign in from a different domain than the original domain where the application was registered, a global administrator of the different domain must grant permission for the application to access directory data. To grant permission, the global administrator should:
-> a. Go to `https://<URL of your developer portal>/aadadminconsent` (for example, https://contoso.portal.azure-api.net/aadadminconsent).
-> b. Type in the domain name of the Azure AD tenant that they want to give access to.
-> c. Select **Submit**. 
+    > [!NOTE]
+    > You can specify multiple domains in the **Allowed Tenants** section. Before any user can sign in from a different domain than the original domain where the application was registered, a global administrator of the different domain must grant permission for the application to access directory data. To grant permission, the global administrator should:
+    > a. Go to `https://<URL of your developer portal>/aadadminconsent` (for example, https://contoso.portal.azure-api.net/aadadminconsent).
+    > b. Type in the domain name of the Azure AD tenant that they want to give access to.
+    > c. Select **Submit**. 
 
 20.  After you specify the desired configuration, select **Add**.
 
@@ -92,7 +92,7 @@ Now you can add external Azure AD groups from the **Groups** tab of your API Man
 
 1. Select the **Groups** tab.
 2. Select the **Add AAD group** button.
-   !["Add AAD group" button](./media/api-management-howto-aad/api-management-with-aad008.png)
+    !["Add AAD group" button](./media/api-management-howto-aad/api-management-with-aad008.png)
 3. Select the group that you want to add.
 4. Press the **Select** button.
 
@@ -102,12 +102,12 @@ Users from the configured Azure AD instance can now sign in to the developer por
 
 ## <a id="log_in_to_dev_portal"/> Developer portal - add Azure AD account authentication
 
-In the developer portal, sign-in with AAD is possible with the **OAuth buttons** widget. The widget is already included on the sign-in page of the default developer portal content.
-
-![AAD buttons widget](./media/api-management-howto-aad/portal-oauth-widget.png)
+In the developer portal, sign-in with AAD is possible with the **Sign-in button: OAuth** widget. The widget is already included on the sign-in page of the default developer portal content.
 
 Although a new account will be automatically created whenever a new user signs in with AAD, you may consider adding the same widget to the sign-up page.
 
+The **Sign-up form: OAuth** widget represents a form used for signing up with OAuth.
+
 > [!IMPORTANT]
 > You need to [republish the portal](api-management-howto-developer-portal-customize.md#publish) for the AAD changes to take effect.
 

articles/api-management/media/api-management-howto-aad/portal-oauth-widget.png

@@ -21,7 +21,7 @@ Here's how you can back up and restore Azure VMs with the Azure Backup service.
 
 **Scenario** | **Backup** | **Agent** |**Restore**
 --- | --- | --- | ---
-Direct backup of Azure VMs  | Back up the entire VM.  | No agent is needed on the Azure VM. Azure Backup installs and uses an extension to the [Azure VM agent](https://docs.microsoft.com/azure/virtual-machines/extensions/agent-windows) that is running on the VM. | Restore as follows:<br/><br/> - **Create a basic VM**. This is useful if the VM has no special configuration such as multiple IP addresses.<br/><br/> - **Restore the VM disk**. Restore the disk. Then attach it to an existing VM, or create a new VM from the disk by using PowerShell.<br/><br/> - **Replace VM disk**. If a VM exists and it uses managed disks (unencrypted), you can restore a disk and use it to replace an existing disk on the VM.<br/><br/> - **Restore specific files/folders**. You can restore files/folders from a VM instead of from the entire VM.
+Direct backup of Azure VMs  | Back up the entire VM.  | No additional agent is needed on the Azure VM. Azure Backup installs and uses an extension to the [Azure VM agent](https://docs.microsoft.com/azure/virtual-machines/extensions/agent-windows) that is running on the VM. | Restore as follows:<br/><br/> - **Create a basic VM**. This is useful if the VM has no special configuration such as multiple IP addresses.<br/><br/> - **Restore the VM disk**. Restore the disk. Then attach it to an existing VM, or create a new VM from the disk by using PowerShell.<br/><br/> - **Replace VM disk**. If a VM exists and it uses managed disks (unencrypted), you can restore a disk and use it to replace an existing disk on the VM.<br/><br/> - **Restore specific files/folders**. You can restore files/folders from a VM instead of from the entire VM.
 Direct backup of Azure VMs (Windows only)  | Back up specific files/folders/volume. | Install the [Azure Recovery Services agent](backup-azure-file-folder-backup-faq.md).<br/><br/> You can run the MARS agent alongside the backup extension for the Azure VM agent to back up the VM at file/folder level. | Restore specific folders/files.
 Back up Azure VM to backup server  | Back up files/folders/volumes; system state/bare metal files; app data to System Center DPM or to Microsoft Azure Backup Server (MABS).<br/><br/> DPM/MABS then backs up to the backup vault. | Install the DPM/MABS protection agent on the VM. The MARS agent is installed on DPM/MABS.| Restore files/folders/volumes; system state/bare metal files; app data.