Merging changes synced from https://github.com/MicrosoftDocs/visualstudio-docs-pr (branch live)

Author: ghogen

subscriptions/_img/aliasing/account-aliases.png

@@ -3,7 +3,8 @@ title:  Set agreement preferences in the Administration Portal
 author: evanwindom
 ms.author: lank
 manager: lank
-ms.date: 03/02/2020
+ms.assetid: 0fe9eaa4-f589-429e-a443-13bf86637d5a
+ms.date: 03/17/2020
 ms.topic: conceptual
 description: Learn how to set preferences for language, contacts, subscription level and others in the Administration Portal
 ---
@@ -35,10 +36,10 @@ If you have multiple agreements for which you're a super admin, you'll be able t
 If there is only one agreement associated with the email address you used to sign in, it will be displayed and the drop-down will be disabled. 
 
 ### Contact email address
-This preferences provides a way for your subscribers to reach out to administrators through the use of the **Contact my Admin** button on the [subscriptions page](https://my.visualstudio.com/subscriptions) of the subscriber portal.  If this preference is left blank, subscriber messages will be forwarded to all administrators and super admins on the agreement.  We recommend using a group email alias or security group to tailor your audience for this contact email. You can also choose to input an individual’s email address if you prefer.
+This preference provides a way for your subscribers to reach out to administrators through the use of the **Contact my Admin** button on the [subscriptions page](https://my.visualstudio.com/subscriptions) of the subscriber portal.  If this preference is left blank, subscriber messages will be forwarded to all administrators and super admins on the agreement.  We recommend using a group email alias or security group to tailor your audience for this contact email. You can also choose to input an individual’s email address if you prefer.
 
 > [!NOTE]
-> The email address you list here will NOT be provided to subscribers.  When a subscriber submits a **Contact my Admin** request in the subscriber portal, the message will be forwarded to the alias without exposing it the subscriber. 
+> The email address you list here will NOT be provided to subscribers.  When a subscriber submits a **Contact my Admin** request in the subscriber portal, the message will be forwarded to the alias without exposing it to the subscriber. 
 
 ### Default external subscribers setting
 This preference allows you to decide whether administrators can add subscribers from outside your organization's tenant/directory.  If you turn this off, no outside subscribers will be allowed.  If you enable it and an admin attempts to add an outside subscriber, they will be asked to confirm their choice, and will be allowed to assign the subscription. Administrators cannot override this setting. 

subscriptions/_img/assign-license-bulk/bulk-add-upload-failure.png

@@ -3,6 +3,7 @@ title: Signing in to Visual Studio Subscriptions May Fail When Using Aliases | M
 author: evanwindom
 ms.author: lank
 manager: lank
+ms.assetid: 97bf7474-c6c2-49b3-b2c9-f1b2808eed1a
 ms.date: 03/02/2020
 ms.topic: conceptual
 description: Sign-in may fail if aliases or friendly names are used
@@ -14,7 +15,7 @@ Depending on the account type used to sign in, available subscriptions may not b
 ## What is aliasing?
 The term “aliasing” refers to users having different identities to sign in to Windows (or your Active Directory) and to access email.
 
-Aliasing can be encountered when a company has a Microsoft Online Service for their directory sign-in, like '[email protected]', but users access their email accounts using aliases or friendly names, such as '[email protected]'. For many customers who manage their subscriptions through the Volume Licensing Service Center (VLSC), this can result in an unsuccessful sign-in experience as the email address provided ('[email protected]') does not match the directory address ('[email protected]') required for successful authentication through the “Work or School Account” option.  Make sure your users are using the “Sign-in Email Address” as listed in the admin portal at https://manage.visualstudio.com to access their subscriptions. 
+Aliasing can be encountered when a company has a Microsoft Online Service for their directory sign-in, like '[email protected]', but users access their email accounts using aliases or friendly names, such as '[email protected]'. Make sure your users are using the “Sign-in Email Address” as listed in the admin portal at https://manage.visualstudio.com to access their subscriptions. 
 
 ## What are the potential issues?
 

subscriptions/_img/assign-license-bulk/bulk-add-upload-success.png

@@ -3,7 +3,8 @@ title: Visual Studio + GitHub Enterprise offer | Microsoft Docs
 author: evanwindom
 ms.author: lank
 manager: lank
-ms.date: 03/03/2020
+ms.assetid: f271d623-dcde-442a-865c-4dca5ad8a9c5
+ms.date: 03/17/2020
 ms.topic: conceptual
 description: Managing subscriptions in the Visual Studio + GitHub Enterprise offer
 ---
@@ -31,7 +32,7 @@ For more information about managing subscriptions, check out these topics:
 ## Manage GitHub Enterprise subscriptions
 When GitHub Enterprise subscriptions are purchased, GitHub partners with customers to help create and configure the organizations that will access GitHub and identify administrators.  Those administrators then receive a notification that they've been set up as admins.  
 
-Since this process is more complex, it may take several days after subscriptions are purchased for the organizations and admins to be fully in set up.
+Since this process is more complex, it may take several days after subscriptions are purchased for the organizations and admins to be fully set up.
 
 GitHub is available as either the cloud-based GitHub.com, or on-premise GitHub Enterprise Server.  The processes for managing the two versions differ.  GitHub provides a variety of help topics and administrator guides to help you manage GitHub Enterprise subscriptions.  We've provided links to selected topics below.  
 

subscriptions/admin-prefs.md

@@ -3,6 +3,7 @@ title: Assign licenses to groups of users for Visual Studio subscriptions | Micr
 author: evanwindom
 ms.author: lank
 manager: lank
+ms.assetid: c2853359-18fd-4be4-97a6-02230c862f92
 ms.date: 03/02/2020
 ms.topic: conceptual
 description:  Learn how administrators can assign licenses to multiple subscribers using either the Bulk add feature or Microsoft Azure Active Directory groups
@@ -14,7 +15,7 @@ The Subscriptions Administration Portal lets you add users one-at-a-time, or in
 To add large groups of users, you can use the bulk add feature, or if your organization is using Microsoft Azure Active Directory (Azure AD), you can use Azure AD groups. This article will explain the process for both options. 
 
 > [!NOTE]
-> The use of Azure AD groups is being enabled in phases so you may not see it on your agreements immediately.
+> The use of Azure AD groups is being enabled in phases.  You may not immediately see the feature enabled for your agreement(s).
 
 ## Use Bulk add to assign subscriptions
 1. Sign into the Visual Studio Subscriptions Administration Portal at https://manage.visualstudio.com.
@@ -50,15 +51,24 @@ To add large groups of users, you can use the bulk add feature, or if your organ
 
     If the template contains errors, the upload will fail, and you will be shown the errors so that you can correct the template and attempt the bulk upload again.
    > [!div class="mx-imgBorder"]
-   > ![Error message if the upload of multiple subscribers fails](media/bulk-add-template-failed.png)
+   > ![Error message if the upload of multiple subscribers fails](_img/assign-license-bulk/bulk-add-upload-failure.png)
+
+   If you encounter a failure follow these steps:
+   1. Open the Excel file you created, correct the problems, and save the file.
+   0. Return to the Adminstration Portal and choose **Add**.
+   0. Select **Bulk add**.
+   0. Since you already have the Excel file saved, you do not need to download the template.  Click **Browse**, locate the file you just saved, and click **Open**.
+   0. Click **OK**.
+
 
     When the upload is successful, you'll see the list of subscribers and a confirmation message.
    > [!div class="mx-imgBorder"]
-   > ![Confirmation message if the upload of multiple subscribers succeeds](media/bulk-add-template-success.png)
+   > ![Confirmation message if the upload of multiple subscribers succeeds](_img/assign-license-bulk/bulk-add-upload-success.png)
 
 ## Use Azure Active Directory groups to assign subscriptions 
 Using this feature makes it easy to stay on top of your subscription assignments. You can add Azure Active Directory Security Groups in the Subscriptions Administration Portal which will ensure that all individuals in the group are assigned a subscription. And to make it easier, when individuals leave your organization and are removed from Azure Active Directory, their access to subscriptions is also removed. 
 
+
 > [!IMPORTANT]
 > The following limitations apply to the use of Azure AD groups for adding subscribers:
 > - Groups must contain at least one member.  Empty groups are not supported.

subscriptions/aliasing.md

@@ -3,13 +3,14 @@ title: Personal emails displayed in VLSC
 author: evanwindom
 ms.author: lank
 manager: lank
-ms.date: 03/03/2020
+ms.assetid: 3f4b0528-03f0-4a02-b3c3-a39292a9bbe1
+ms.date: 03/17/2020
 ms.topic: conceptual
 description:  Visual Studio Subscriptions – Why Am I Seeing Hotmail or Gmail Addresses for My Subscribers?
 ---
 
-# Visual Studio subscriptions – Why am I seeing Hotmail or Gmail addresses for my subscribers?
-After companies migrated from the Volume Licensing Service Center (VLSC) to the new Visual Studio [Subscriptions Administration Portal](https://manage.visualstudio.com), administrators were surprised to find that the “Sign-in Email Address” for some subscribers shows a 3rd party email address like Hotmail, Gmail, or Yahoo.  For more information, check out [this video](https://www.youtube.com/watch?v=J61EYaVN-dQ&list=PLReL099Y5nReJhZ6o8CQFPSBgzGCHX99_&index=6).
+# Visual Studio subscriptions – Why I see personal accounts for my subscribers?
+After companies migrated from the Volume Licensing Service Center (VLSC) to the new Visual Studio [Subscriptions Administration Portal](https://manage.visualstudio.com), administrators were surprised to find that the “Sign-in Email Address” for some subscribers shows a personal email address like Hotmail or Outlook.  For more information, check out [this video](https://www.youtube.com/watch?v=J61EYaVN-dQ&list=PLReL099Y5nReJhZ6o8CQFPSBgzGCHX99_&index=6).
 
 ## Cause
 This scenario occurs due to sign-in processes that were associated with the legacy MSDN subscriber experience. Users were migrated from the Volume License Service Center (VLSC) to the Visual Studio Subscriptions Administration Portal without modifications. Administrators may not have been aware that users had been using personal accounts to access their subscription benefits. Prior to the Visual Studio subscriber migrations, which were completed in 2016, there were two actions required to successfully use a Visual Studio Subscription:
@@ -20,7 +21,7 @@ During the subscriber activation process:
 A Microsoft Account (MSA) was required to sign-in. If the subscriber didn’t attempt to make their work or school account (e.g. [email protected]) an MSA, they could create a new MSA or leverage an existing one. This resulted in their “Sign-in Email Address” being different than their “Assigned to Email Address”.
 
 > [!NOTE]
-> The new subscriber experience on [https://my.visualstudio.com](https://my.visualstudio.com?wt.mc_id=o~msft~docs) supports both Work/School and Microsoft Account (MAA) identity types.
+> The modern subscriber experience on [https://my.visualstudio.com](https://my.visualstudio.com?wt.mc_id=o~msft~docs) supports both Work/School and Microsoft Account (MSA) identity types.
 
 ## Solution
 To correct the problem, simply select the **Connect Emails** button and the system will attempt to match the accounts with MSAs to existing users in your organization’s Azure Active Directory (Azure AD) based on matching the first and last name. If there is an error, you can remove any match by clicking on the **X** to the right of the match.  
@@ -39,7 +40,7 @@ Next click on “continue” which will take you to a screen outlining the chang
 > ![Connect Emails Confirmation](_img/connect-emails/connect-emails-confirm.png) 
 
 > [!NOTE]
-> When you edit the sign in email address is that this only updates the email used to sign in to their subscription on https://my.visualstudio.com. If the subscriber has already activated benefits such as Azure or Pluralsight using the other email address, they will need to continue to use those email addresses to access them. For any new benefits that they access, they should use the new email address. 
+> When you edit the sign in email address this only updates the email used by the subscriber to sign in to their subscription on https://my.visualstudio.com. If the subscriber has already activated benefits such as Azure or Pluralsight using the other email address, they will need to continue to use those email addresses to access them. For any new benefits that they access, they should use the new email address. 
 
 ## See also
 - [Visual Studio documentation](https://docs.microsoft.com/visualstudio/)

subscriptions/assign-github.md

@@ -3,7 +3,8 @@ title: Microsoft Azure benefit | Microsoft Docs
 author: evanwindom
 ms.author: lank
 manager: lank
-ms.date: 07/29/2019
+ms.assetid: 872c5746-5357-4764-949b-aa525a0adf1a
+ms.date: 03/18/2020
 ms.topic: conceptual
 description:  Learn how to activate the Azure DevTest individual credit benefit included in your Visual Studio subscription.
 ---
@@ -85,9 +86,7 @@ To continue using your Visual Studio Azure DevTest individual credit and discoun
 
 If someone in your team or organization purchases subscriptions on your behalf, contact your organization’s Visual Studio administrator and request a Visual Studio subscription that entitles you to the Azure DevTest individual credit amount you need.   Please request the administrator to assign the new subscription to the same user ID that your previous subscription was assigned to, so that you don’t have to worry about transferring your Azure subscription.
 
-If you can purchase a subscription directly, please do one of the following:
-1. Purchase an annual Visual Studio [Enterprise](https://marketplace.visualstudio.com/items?itemName=ms.vs-enterprise-annual) or [Professional](https://marketplace.visualstudio.com/items?itemName=ms.vs-professional-annual) cloud subscription through the Visual Studio Marketplace.
-2. Take advantage of a 50% or higher discount by renewing your current subscription through the [Microsoft Store](https://www.microsoft.com/en-us/search/result.aspx?q=visual+studio+subscription).
+If you can purchase a subscription directly, take advantage of a discount by renewing your current subscription through the [Microsoft Store](https://www.microsoft.com/en-us/search/result.aspx?q=visual+studio+subscription).
 
 Compare all the [subscriptions and their benefits](https://visualstudio.microsoft.com/vs/pricing/).