Document features supporting license synchronization for the GitHub E…

…nterprise and Visual Studio bundle (github#15720)

* Add back changes from prior to purge

* Fix tip syntax

* Revise conceptual introduction

* Use variable

* Revise "Further reading"

* Link out

* Add quotes

* Add prerequisites

* Move information out of note

* Simplify language

* Simplify further

* Evergreenify

* Tentatively remove section on overallocation

* Relocate more information; clean up

* Add permissions statement

* Use 'enterprise account'

* Cross-link

* Update linked content

* Mention pending invitations

* Move section

* Add introduction

* Flesh out conceptual introduction

* Remove "Further reading"; article in map topic

* Version link out for GitHub.com only

* Revert "Remove "Further reading"; article in map topic"

This reverts commit 6cfa72825878b3ee0662baaf1a215c4974563232.

* Remove correct section

* Run the site data tag script

* Fix typo

* Remove quotes

* Add missing word

* Break optional steps into ordered list items

* Add product; reorganize groupings

* Rename article; use Microsoft terminology

* Incorporate Winnie's feedback

* Deduplicate the spaces

* Simplify

* Use consistent terminology

* Revise introduction

* Revise further

* 🌲

* Incorporate more feedback from Winnie

* Add permissions statement

* Be explicit after all

* Actually, no, no permissions statement

* Fix typo

* Add prerequisite for clarity

Co-authored-by: Jason Etcovitch <[email protected]>
Co-authored-by: Meg Bird <[email protected]>

content/github/authenticating-to-github/about-two-factor-authentication.md

@@ -1,6 +1,6 @@
 ---
 title: About two-factor authentication
-intro: 'Two-factor authentication, or 2FA, is an extra layer of security used when logging into websites or apps. With 2FA, you have to log in with your username and password and provide another form of authentication that only you know or have access to.'
+intro: '{% data reusables.two_fa.about-2fa %} With 2FA, you have to log in with your username and password and provide another form of authentication that only you know or have access to.'
 redirect_from:
   - /articles/about-two-factor-authentication
 versions:

content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md

@@ -1,6 +1,7 @@
 ---
 title: Inviting users to join your organization
 intro: 'You can invite anyone to become a member of your organization using their {% data variables.product.product_name %} username or email address.'
+permissions: 'Organization owners can invite users to join an organization.'
 redirect_from:
   - /articles/adding-or-inviting-members-to-a-team-in-an-organization/
   - /articles/inviting-users-to-join-your-organization
@@ -11,9 +12,8 @@ versions:
 {% tip %}
 
 **Tips**:
-- Only organization owners can invite users to join an organization. For more information, see "[Permission levels for an organization](/articles/permission-levels-for-an-organization)."
 - If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}
-- If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users you invite must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.
+- If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)."
 
 {% endtip %}
 

content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md

@@ -8,11 +8,15 @@ versions:
   enterprise-server: '*'
 ---
 
-{% data reusables.two_fa.auth_methods_2fa %}
+### About two-factor authentication for organizations
+
+{% data reusables.two_fa.about-2fa %} You can require all {% if currentVersion == "free-pro-team@latest" %}members, outside collaborators, and billing managers{% else %}members and outside collaborators{% endif %} in your organization to enable two-factor authentication on {% data variables.product.product_name %}. For more information about two-factor authentication, see "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)."
 
-### Requirements for enforcing two-factor authentication
+{% if currentVersion == "free-pro-team@latest" %}
 
-Before you can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to use 2FA, you must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa/) for your own personal account.
+You can also require two-factor authentication for organizations in an enterprise. For more information, see "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account#requiring-two-factor-authentication-for-organizations-in-your-enterprise-account)."
+
+{% endif %}
 
 {% warning %}
 
@@ -24,7 +28,15 @@ Before you can require {% if currentVersion == "free-pro-team@latest" %}organiza
 
 {% endwarning %}
 
-Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can [see if members and outside collaborators already use 2FA](/articles/viewing-whether-users-in-your-organization-have-2fa-enabled) on your organization's People page.
+{% data reusables.two_fa.auth_methods_2fa %}
+
+### Prerequisites
+
+Before you can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to use two-factor authentication, you must enable two-factor authentication for your account on {% data variables.product.product_name %}. For more information, see "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)."
+
+Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can see if members and outside collaborators already use 2FA. For more information, see "[Viewing whether users in your organization have 2FA enabled](/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled)."
+
+### Requiring two-factor authentication in your organization
 
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}

content/github/setting-up-and-managing-your-enterprise-account/index.md

@@ -14,6 +14,7 @@ versions:
 {% topic_link_in_list /managing-your-enterprise-account %}
     {% link_in_list /about-enterprise-accounts %}
     {% link_in_list /viewing-the-subscription-and-usage-for-your-enterprise-account %}
+    {% link_in_list /managing-licenses-for-visual-studio-subscription-with-github-enterprise %}
 {% topic_link_in_list /managing-users-in-your-enterprise-account %}
     {% link_in_list /roles-for-an-enterprise-account %}
     {% link_in_list /inviting-people-to-manage-your-enterprise-account %}

content/github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md

@@ -0,0 +1,42 @@
+---
+title: Managing licenses for Visual Studio subscription with GitHub Enterprise
+intro: 'You can manage {% data variables.product.prodname_enterprise %} licensing for {% data variables.product.prodname_vss_ghe %}.'
+redirect_from:
+  - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
+  - /github/articles/about-the-github-and-visual-studio-bundle
+  - /articles/about-the-github-and-visual-studio-bundle
+versions:
+  free-pro-team: '*'
+---
+
+### About {% data variables.product.prodname_vss_ghe %} 
+
+{% data variables.product.prodname_vss_ghe %} is a combined offering from Microsoft that allows a subscriber to use both {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_vs %}. {% data variables.product.prodname_vss_ghe %} is available from Microsoft under the terms of the Microsoft Enterprise Agreement. For more information, see [{% data variables.product.prodname_vss_ghe %}](https://visualstudio.microsoft.com/subscriptions/visual-studio-github/) on the {% data variables.product.prodname_vs %} website.
+
+After you assign a license for {% data variables.product.prodname_vss_ghe %}  to a subscriber, the subscriber will use the {% data variables.product.prodname_enterprise %} portion of the license by joining an organization in your enterprise account with a user account on {% data variables.product.prodname_dotcom_the_website %}.
+
+For more information about {% data variables.product.prodname_enterprise %}, see "[{% data variables.product.company_short %}'s products](/github/getting-started-with-github/githubs-products#github-enterprise)." For more information about accounts on {% data variables.product.prodname_dotcom_the_website %}, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/github/getting-started-with-github/types-of-github-accounts)."
+
+### Prerequisites
+
+1. After you buy {% data variables.product.prodname_vss_ghe %}, contact {% data variables.contact.contact_enterprise_sales %} and mention "{% data variables.product.prodname_vss_ghe %}." You'll work with the Sales team to create an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. If you already have an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, or if you're not sure, please tell our Sales team.
+
+2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
+
+3. On {% data variables.product.prodname_dotcom_the_website %}, create at least one organization owned by your enterprise account. For more information, see "[Adding organizations to your enterprise account](/github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account)."
+
+4. The subscriber must create a user account on {% data variables.product.prodname_dotcom_the_website %}, and the email address for the account must be the same email address as the email address in the {% data variables.product.prodname_vs %} portal. For more information, see "[Signing up for {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/signing-up-for-github)" and "[Managing email preferences](/github/setting-up-and-managing-your-github-user-account/managing-email-preferences)."
+
+### Inviting a subscriber to use {% data variables.product.prodname_enterprise %}
+
+To use the {% data variables.product.prodname_enterprise %} portion of the license, the subscriber must join an organization owned by your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Organization owners can invite new members to an organization. For more information, see "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)."
+
+### Viewing {% data variables.product.prodname_enterprise %} licensing
+
+After assigning a license for {% data variables.product.prodname_vss_ghe %} in {% data variables.product.prodname_vss_admin_portal_with_url %}, you can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise account. For more information, see "[Viewing the subscription and usage for your enterprise account](/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+
+You can also see pending {% data variables.product.prodname_enterprise %} invitations to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise account. For more information, see "[Viewing people in your enterprise account](/github/setting-up-and-managing-your-enterprise-account/viewing-people-in-your-enterprise-account#viewing-members-and-outside-collaborators)."
+
+### Further reading
+
+- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github) in the Microsoft Docs

content/github/setting-up-and-managing-your-enterprise-account/viewing-people-in-your-enterprise-account.md

@@ -16,6 +16,8 @@ You can view enterprise owners and billing managers, as well as a list of pendin
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
 {% data reusables.enterprise-accounts.administrators-tab %}
+1. Optionally, to view a list of pending invitations, click **_NUMBER_ pending**.
+  !["NUMBER pending" button to the right of search and filter options](/assets/images/help/enterprises/administrators-pending.png)
 
 ### Viewing members and outside collaborators
 
@@ -25,8 +27,10 @@ You can view all the {% data variables.product.prodname_ghe_cloud %} organizatio
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
-3. Optionally, to view a list of outside collaborators rather than the list of members, click **Outside collaborators**.
+1. Optionally, to view a list of outside collaborators rather than the list of members, click **Outside collaborators**.
   ![Outside collaborators tab on the Organization members page](/assets/images/help/business-accounts/outside-collaborators-tab.png)
+1. Optionally, to view a list of pending invitations, click **_NUMBER_ pending**.
+  !["NUMBER pending" button to the right of search and filter options](/assets/images/help/enterprises/members-pending.png)
 
 ### Further reading
 

data/reusables/enterprise-accounts/access-enterprise.md

@@ -1 +1,5 @@
-1. Navigate to your enterprise account by visiting `https://github.com/enterprises/ENTERPRISE-NAME`, replacing `ENTERPRISE-NAME` with your enterprise account's name.
+1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**.
+  !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png)
+
+1. In the list of enterprises, click the enterprise you want to view.
+  ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)

data/reusables/two_fa/about-2fa.md

@@ -0,0 +1 @@
+Two-factor authentication (2FA) is an extra layer of security used when logging into websites or apps.

data/variables/product.yml

@@ -105,10 +105,8 @@ prodname_advanced_security: 'Advanced Security'
 
 # Codespaces
 prodname_codespaces: 'Codespaces'
-prodname_vscode: 'Visual Studio Code'
 prodname_vs_codespaces: 'Visual Studio Codespaces'
 prodname_github_codespaces: 'GitHub Codespaces'
-prodname_vs: 'Visual Studio'
 
 # GitHub resources: blog, jobs, Learning Lab
 prodname_gcf: 'GitHub Community Support'
@@ -142,6 +140,12 @@ prodname_codeql_runner: 'CodeQL runner'
 prodname_advisory_database: 'GitHub Advisory Database'
 prodname_codeql_workflow: 'CodeQL analysis workflow'
 
+# Visual Studio
+prodname_vs: 'Visual Studio'
+prodname_vscode: 'Visual Studio Code'
+prodname_vss_ghe: 'Visual Studio subscription with GitHub Enterprise'
+prodname_vss_admin_portal_with_url: 'the [administrator portal for Visual Studio subscriptions](https://visualstudio.microsoft.com/subscriptions-administration/)'
+
 # GitHub Dependabot
 prodname_dependabot: 'GitHub Dependabot'
 prodname_dependabot_short: 'Dependabot'