Merge pull request #3172 from MicrosoftDocs/master636922418100650602

gewarren · web-flow · commit 1c18b8460b55 · 2019-04-30T10:23:47.000-07:00
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/subscriptions/TOC.md b/subscriptions/TOC.md
@@ -12,10 +12,11 @@
 ### [Download Software](subscriber-downloads.md)
 #### [List of Available Software Downloads](software-download-list.md)
 ### [Obtain & Manage Product Keys](product-keys.md)
+### [Visual Studio with GitHub Enterprise](access-github.md)
+### [Subscriber Benefits](subscriber-benefits.md)
 ### Visual Studio Dev Essentials
 #### [Join Visual Studio Dev Essentials](join-dev-essentials.md)
 #### [Opt Out of Visual Studio Dev Essentials](leave-vsde.md)
-### [Subscriber Benefits](subscriber-benefits.md)
 ## Using Subscriber Benefits
 ### Tools
 #### [Visual Studio IDE](vs-ide-benefit.md)
@@ -72,6 +73,7 @@
 #### [Maximum Usage](maximum-usage.md)
 #### [Expired Subscriptions](handle-expired-license.md)
 #### [Subscribers with Personal Email Sign-ins](personal-email-sign-ins.md)
+### [Managing Visual Studio with GitHub Enterprise](assign-github.md)
 ## Acquiring Visual Studio Subscriptions
 ### [Compare Subscription Options](https://visualstudio.microsoft.com/vs/pricing)
 ### Buying Cloud Subscriptions
diff --git a/subscriptions/access-github.md b/subscriptions/access-github.md
@@ -0,0 +1,82 @@
+---
+title: Visual Studio + GitHub Bundle | Microsoft Docs
+author: evanwindom
+ms.author: lank
+manager: lank
+ms.date: 04/15/2019
+ms.topic: conceptual
+description: Learn about the new Visual Studio + GitHub bundle
+searchscope: VS Subscription
+---
+
+# Introducing Visual Studio subscriptions with GitHub Enterprise  
+
+Customers who have Enterprise Agreements (EA) with Microsoft are eligible to purchase a new subscription bundle that brings together Visual Studio standard subscriptions and GitHub Enterprise. It's an easy and economical way for Visual Studio subscribers to acquire GitHub Enterprise. 
+
+- Innovate at scale with Visual Studio and GitHub by securely bringing open source code, community and best practices into your IDE and workflows.
+- Use best in class development tools and services for developers with the most comprehensive set of resources to create, deploy and manage great applications. 
+- Collaborate, manage pull requests on GitHub Enterprise and review source code where it was written - in the editor. 
+
+## What's available? 
+
+If your organization is entering a new EA or renewing an existing one, the following options are available:
+
+- Visual Studio Enterprise with GitHub Enterprise
+- Visual Studio Professional with GitHub Enterprise
+
+If your organization has an EA that's not due to renew yet, you can purchase the "Step-up" SKU to add GitHub Enterprise to your existing Visual Studio Enterprise or Visual Studio Professional subscriptions.  Then when your agreement renews, you can purchase the bundle.
+
+Existing SKUs for Visual Studio Enterprise, Visual Studio Professional, and GitHub Enterprise will also continue to be available separately. 
+
+To learn more about benefits, options, and pricing please visit https://visualstudio.microsoft.com/subscriptions/visual-studio-github. 
+
+## Getting your subscriptions
+
+Visual Studio + GitHub Enterprise subscriptions are assigned in two parts:
+1. The Visual Studio subscription (Enterprise or Professional)
+2. The GitHub Enterprise subscription
+
+When your organization purchases subscriptions, they're assigned by administrators.  The Visual Studio subscriptions and GitHub Enterprise subscriptions are assigned separately.  
+
+If you are assigned a Visual Studio + GitHub subscription, you'll receive an email letting you know that your Visual Studio subscription administrator has assigned a subscription to you.  At that point, you will be able to see it at https://my.visualstudio.com/subscriptions.  
+
+Since the GitHub Enterprise subscriptions are assigned separately, you may receive a notification from a different administrator, depending on how your company chose to organize their subscriptions.  There may also be a delay between assignment of the Visual Studio subscription and the GitHub Enterprise subscription, so don't be concerned if they're not both immediately available.  The GitHub subscription assignment process is more complex, and may take several business days to complete.  
+
+## Getting started with GitHub
+
+If you're new to GitHub, here are some resources that may be helpful to you:
+
+| Subject                                  | GitHub Help Topic                                     |
+|------------------------------------------|-------------------------------------------------------|
+| General   questions/information          | [GitHub Help](https://help.github.com/en)             |
+| What is   GitHub?  How do I learn more?  | [About GitHub](https://help.github.com/en/categories/about-github)                                       |
+| How do I   get started using GitHub?     | [Bootcamp](https://help.github.com/en/categories/bootcamp)                                              |
+| How do I manage my   user account and profile?       | [Setting up and   managing your GitHub user account](https://help.github.com/en/categories/setting-up-and-managing-your-github-user-account)    |
+| How do I manage my   access to GitHub?   | [Authenticating to   GitHub](https://help.github.com/en/categories/authenticating-to-github)                           |
+| How does GitHub use and protect my data? | [Understanding how   GitHub uses and protect your data](https://help.github.com/en/categories/understanding-how-github-uses-and-protects-your-data)|
+
+## Frequently asked questions
+
+### Q:  Where is my GitHub subscription?
+
+A:  The process for setting up GitHub subscription can take a while.  If you've been waiting and haven't heard anything, you may want to reach out to your GitHub administrator.  It's possible that your administrator is still working on it, or has elected not to assign a GitHub subscription to you. 
+
+### Q:  How do I reach my GitHub administrator?
+
+A:  If you're using GitHub Enterprise Server, you can click on the **Support** link visible at the bottom of the client to be connected with your administrator.
+
+### Q: Do I get the full Visual Studio subscription (Professional or Enterprise) or do I just get the IDE with this offering?
+
+A:  Along with a GitHub Enterprise subscription, you receive a full Visual Studio subscription.  You receive all the benefits such as software downloads, cloud services, technical support and partner benefits included in those subscriptions, just as you would if the subscription was purchased separately.
+
+
+## Support resources
+-  You can find answers to questions on a wide array of GitHub topics at [GitHub Help](https://help.github.com/en).
+-  Get help from other GitHub users in the [GitHub Community Forum](https://i.8713187.xyzmunity/).
+-  For assistance with sales, subscriptions, accounts and billing for Visual Studio Subscriptions, contact Visual Studio [Subscriptions Support](https://visualstudio.microsoft.com/subscriptions/support/).
+-  Have a question about Visual Studio IDE, Azure DevOps Services or other Visual Studio products or services?  Visit [Visual Studio Support](https://visualstudio.microsoft.com/support/).
+-  Get [technical support](https://support.microsoft.com/en-us/supportforbusiness/productselection?sapId=b77fe80f-5417-80bd-4b2a-275cf0018c24) for GitHub Enterprise.   
+
+
+## Next steps
+If you're new to GitHub, check out the [GitHub Learning Lab](https://lab.github.com/), which takes you through a series of fun and practical projects, sharing helpful feedback along the way.
diff --git a/subscriptions/assign-github.md b/subscriptions/assign-github.md
@@ -0,0 +1,77 @@
+---
+title: Visual Studio + GitHub Bundle | Microsoft Docs
+author: evanwindom
+ms.author: lank
+manager: lank
+ms.date: 04/23/2019
+ms.topic: conceptual
+description: Managing subscriptions in the Visual Studio + GitHub bundle
+searchscope: VS Subscription
+---
+
+# Managing Visual Studio subscriptions with GitHub Enterprise
+
+Customers who have Enterprise Agreements (EA) with Microsoft are eligible to purchase a new subscription bundle that brings together Visual Studio standard subscriptions and GitHub Enterprise. It's the easy and economical way for Visual Studio subscribers to acquire GitHub Enterprise. 
+
+When your organization purchases Visual Studio Subscriptions with GitHub Enterprise, they are provisioned and managed in two parts.
+
+## Managing Visual Studio subscriptions
+
+When your organization purchases Visual Studio Subscriptions with GitHub Enterprise, the Visual Studio portion of the subscriptions is provisioned immediately and the subscriptions are available for assignment and management in the Visual Studio [Subscriptions Administration](https://manage.visualstudio.com) portal. 
+
+For more information about managing subscriptions, check out these topics:
+- [Using the Admin Portal](using-admin-portal.md)
+- [Assign Subscriptions](assign-license.md)
+- [Edit Subscriptions](edit-license.md)
+- [Delete Subscriptions](delete-license.md)
+- [Overallocations](handle-overclaimed-license.md)
+
+> [!Important]
+> If Visual Studio Subscriptions with GitHub Enterprise are assigned by Visual Studio subscription admins and there has never been a purchase of those subscriptions, they will not be visible to GitHub Enterprise admins within the organization. To ensure GitHub Enterprise subscriptions are visible, a purchase including **at least one** Visual Studio Professional with GitHub Enterprise or Visual Studio Enterprise with GitHub Enterprise subscription should be made the first time the subscriptions are assigned.  
+>
+> It is the customer’s responsibility to ensure that for each GitHub subscription that is assigned there is a corresponding Visual Studio with GitHub subscription assigned in the Manage portal to remain in compliance with the licensing requirements for this subscription.
+
+## Managing 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.
+
+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.  
+
+### GitHub<span></span>.com 
+
+For more information on managing GitHub<span></span>.com please check out the following topics on [GitHub Help](https://help.github.com/en).
+- [Full list of help topics](https://help.github.com/en)
+- [Managing membership in your organization](https://help.github.com/en/articles/managing-membership-in-your-organization)
+> - [Inviting users to join your organization](https://help.github.com/en/articles/inviting-users-to-join-your-organization)
+> - [Removing users from teams/organizations](https://help.github.com/en/articles/removing-a-member-from-your-organization)
+> - [Reinstating a former member of your organization](https://help.github.com/en/articles/reinstating-a-former-member-of-your-organization)
+- [Managing access using roles](https://help.github.com/en/articles/managing-peoples-access-to-your-organization-with-roles)
+- [Organizing users into teams](https://help.github.com/en/articles/organizing-members-into-teams)
+- [Managing access to your organization's repositories](https://help.github.com/en/articles/managing-access-to-your-organizations-repositories)
+
+### GitHub Enterprise Server
+
+GitHub Help provides a variety of administrator guides to answer questions and give tips on management of your organization's implementation of GitHub Enterprise Server.
+
+- [View all administrator guides](https://help.github.com/en/enterprise/2.16/admin)
+- [User Management](https://help.github.com/en/enterprise/2.16/admin/user-management)
+> - [Organizations and teams](https://help.github.com/en/enterprise/2.16/admin/user-management/organizations-and-teams)
+> > - [Creating organizations](https://help.github.com/en/enterprise/2.16/admin/user-management/creating-organizations)
+> > - [Creating teams](https://help.github.com/en/enterprise/2.16/admin/user-management/creating-teams)
+> > - [Adding people to teams](https://help.github.com/en/enterprise/2.16/admin/user-management/adding-people-to-teams)
+> > - [Removing people from teams and organizations](https://help.github.com/en/enterprise/2.16/admin/user-management/removing-users-from-teams-and-organizations)
+> - [User security](https://help.github.com/en/enterprise/2.16/admin/user-management/user-security)
+- [Installing and configuring GitHub Enterprise Server](https://help.github.com/en/enterprise/2.16/admin/installation)
+
+
+## Support resources
+-  You can find answers to questions on a wide array of GitHub topics at [GitHub Help](https://help.github.com/en).
+-  Get help from other GitHub users in the [GitHub Community Forum](https://i.8713187.xyzmunity/).
+-  For assistance with sales, subscriptions, accounts and billing for Visual Studio Subscriptions, contact Visual Studio [Subscriptions Support](https://visualstudio.microsoft.com/subscriptions/support/).
+-  Have a question about Visual Studio IDE, Azure DevOps Services or other Visual Studio products or services?  Visit [Visual Studio Support](https://visualstudio.microsoft.com/support/).
+-  Get [technical support](https://support.microsoft.com/en-us/supportforbusiness/productselection?sapId=b77fe80f-5417-80bd-4b2a-275cf0018c24) for GitHub Enterprise.   
+
+## Next steps
+For more information about managing Visual Studio Subscriptions with GitHub Enterprise, check out the Visual Studio [subscriptions admin portal](https://visualstudio.microsoft.com/subscriptions-administration/).
diff --git a/subscriptions/handle-overclaimed-license.md b/subscriptions/handle-overclaimed-license.md
@@ -9,7 +9,7 @@ description:  Learn how administrators can resolve over-claimed subscriptions
 searchscope: VS Subscription
 ---
 
-# Handling ‘over-claimed’ subscriptions
+# Overallocated subscriptions
 
 Sometimes orders are changed after subscribers have been added, which can result in having more assigned subscriptions than licenses owned by your company. When this happens, the Subscribers tab shows an alert and provides you with further information.
 
@@ -19,8 +19,27 @@ Sometimes orders are changed after subscribers have been added, which can result
 > [!div class="mx-imgBorder"]
 > ![Notice of Over-claimed Subscriptions](_img/over-claimed/over-claimed-alert.png)
 
-1. To resolve over-claimed licenses, click the alert text. This will display a filtered list of the subscribers that are assigned to the subscription level and expiration date that is over-claimed. 
+## Resolving overallocated subscriptions
+
+To resolve overallocated licenses:
+
+1. Click the alert text. This will display a filtered list of the subscribers that are assigned to the subscription level and expiration date that is over-claimed. 
 
 2. Remove subscribers as needed to rectify the over-claimed licenses. 
 
 3. The overview on the left side of the page will update to show that you are once again in compliance, and all over-claimed notifications will disappear. 
+
+## Billing and true-up
+
+If your organization has an Enterprise Agreement (EA), admins are able to assign subscriptions without purchasing them, and pay for them later through a reconciliation process known as a "true-up".  When you overallocate, your organization will be billed for the maximum number of subscriptions assigned to users during the "true-up".  This is true even if you no longer have the maximum number of subscriptions assigned at the time the true-up takes place.  To learn more about monitoring your maximum usage, visit the [Maximum Usage](maximum-usage.md) topic.
+
+> [!Important]
+> If Visual Studio Subscriptions with GitHub Enterprise are assigned by Visual Studio subscription admins and there has never been a purchase of those subscriptions, they will not be visible to GitHub Enterprise admins within the organization. To ensure GitHub Enterprise subscriptions are visible, a purchase including **at least one** Visual Studio Professional with GitHub Enterprise or Visual Studio Enterprise with GitHub Enterprise subscription should be made the first time the subscriptions are assigned.  
+>
+> It is the customer’s responsibility to ensure that for each GitHub subscription that is assigned there is a corresponding Visual Studio with GitHub subscription assigned in the Manage portal to remain in compliance with the licensing requirements for this subscription.
+
+
+Learn more about managing [Visual Studio Subscriptions with GitHub Enterprise](assign-github.md).
+
+## Support resources
+-  For assistance with sales, subscriptions, accounts and billing for Visual Studio Subscriptions, contact Visual Studio [Subscriptions Support](https://visualstudio.microsoft.com/subscriptions/support/).
diff --git a/subscriptions/vs-azure-devops.md b/subscriptions/vs-azure-devops.md
@@ -36,7 +36,7 @@ If you don't see all your subscriptions, you may have one or more assigned to a
 
 Learn more about Azure DevOps features:
 
-- [Azure Boards & Repos (Basic)](https://visualstudio.microsoft.com/team-services/compare-features/)
+- [Azure Boards & Repos (Basic)](https://azure.microsoft.com/services/devops/compare-features/)
 - [Azure Test Plans](https://marketplace.visualstudio.com/items?itemName=ms.vss-testmanager-web)
 - [Azure Artifacts](https://marketplace.visualstudio.com/items?itemName=ms.feed)
 
