Consolidate conceptual, billing, and licensing information about enterprise accounts (#20261)
This commit is contained in:
Matt Pollard
@@ -1,7 +1,8 @@
|
||||
---
|
||||
title: Inviting people to manage your enterprise
|
||||
intro: You can invite people to become enterprise owners or billing managers in your enterprise account. You can also remove enterprise owners or billing managers who no longer need access to the enterprise account.
|
||||
intro: You can {% ifversion fpt %}invite people to become enterprise owners or billing managers for{% elsif ghes %}add enterprise owners to{% endif %} your enterprise account. You can also remove enterprise owners {% ifversion fpt %}or billing managers {% endif %}who no longer need access to the enterprise account.
|
||||
product: '{% data reusables.gated-features.enterprise-accounts %}'
|
||||
permissions: 'Enterprise owners can {% ifversion fpt %}invite other people to become{% elsif ghes %}add{% endif %} additional enterprise administrators.'
|
||||
redirect_from:
|
||||
- /github/setting-up-and-managing-your-enterprise-account/inviting-people-to-manage-your-enterprise-account
|
||||
- /articles/inviting-people-to-collaborate-in-your-business-account/
|
||||
@@ -11,12 +12,21 @@ versions:
|
||||
fpt: '*'
|
||||
ghes: '*'
|
||||
topics:
|
||||
- Administrator
|
||||
- Enterprise
|
||||
- User account
|
||||
shortTitle: Invite people to manage
|
||||
---
|
||||
## About inviting people to manage your enterprise account
|
||||
|
||||
{% data reusables.enterprise-accounts.enterprise-administrators %} For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise).
|
||||
## About users who can manage your enterprise account
|
||||
|
||||
{% data reusables.enterprise-accounts.enterprise-administrators %} For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise)."
|
||||
|
||||
{% ifversion ghes %}
|
||||
|
||||
If you want to manage owners and billing managers for an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, see "[Inviting people to manage your enterprise](/free-pro-team@latest/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise)" in the {% data variables.product.prodname_dotcom_the_website %} documentation.
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% tip %}
|
||||
|
||||
@@ -24,24 +34,28 @@ shortTitle: Invite people to manage
|
||||
|
||||
{% endtip %}
|
||||
|
||||
## Inviting an enterprise administrator to your enterprise account
|
||||
## {% ifversion fpt %}Inviting{% elsif ghes %}Adding{% endif %} an enterprise administrator to your enterprise account
|
||||
|
||||
Only enterprise owners can invite other people to become enterprise administrators.
|
||||
|
||||
After you invite someone to join the enterprise account, they must accept the emailed invitation before they can access the enterprise account.
|
||||
{% ifversion fpt %}After you invite someone to join the enterprise account, they must accept the emailed invitation before they can access the enterprise account.{% endif %}
|
||||
|
||||
{% data reusables.enterprise-accounts.access-enterprise %}
|
||||
{% data reusables.enterprise-accounts.people-tab %}
|
||||
3. In the left sidebar, click **Administrators**.
|
||||
1. In the left sidebar, click **Administrators**.
|
||||
|
||||
4. Above the list of administrators, click **Invite admin**.
|
||||
|
||||
5. Type the username, full name, or email address of the person you want to invite to become an enterprise administrator, then select the appropriate person from the results.
|
||||
|
||||
6. Select **Owner** or **Billing Manager**.
|
||||
1. Above the list of administrators, click {% ifversion fpt %}**Invite admin**{% elsif ghes %}**Add owner**{% endif %}.
|
||||
{% ifversion fpt %}
|
||||
|
||||
{% elsif ghes %}
|
||||
|
||||
{% endif %}
|
||||
1. Type the username, full name, or email address of the person you want to invite to become an enterprise administrator, then select the appropriate person from the results.
|
||||
{% ifversion fpt %}
|
||||
1. Select **Owner** or **Billing Manager**.
|
||||
|
||||
7. Click **Send Invitation**.
|
||||
|
||||
1. Click **Send Invitation**.
|
||||
{% endif %}{% ifversion ghes %}
|
||||
1. Click **Add**.
|
||||
{% endif %}
|
||||
|
||||
## Removing an enterprise administrator from your enterprise account
|
||||
|
||||
@@ -49,5 +63,10 @@ Only enterprise owners can remove other enterprise administrators from the enter
|
||||
|
||||
{% data reusables.enterprise-accounts.access-enterprise %}
|
||||
{% data reusables.enterprise-accounts.people-tab %}
|
||||
3. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click **Remove owner** or **Remove billing manager**.
|
||||
1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click **Remove owner**{% ifversion fpt %} or **Remove billing manager**{% endif %}.
|
||||
{% ifversion fpt %}
|
||||
|
||||
{% elsif ghes %}
|
||||
|
||||
{% endif %}
|
||||
1. Read the confirmation, then click **Remove owner**{% ifversion fpt %} or **Remove billing manager**{% endif %}.
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: About enterprise accounts
|
||||
intro: 'With {% data variables.product.prodname_ghe_cloud %}, you can create an enterprise account to enable collaboration between your organizations, while giving administrators a single point of visibility and management.'
|
||||
intro: 'With {% data variables.product.product_name %}, you can use an enterprise account to {% ifversion fpt %}enable collaboration between your organizations, while giving{% elsif ghes or ghae %}give{% endif %} administrators a single point of visibility and management.'
|
||||
product: '{% data reusables.gated-features.enterprise-accounts %}'
|
||||
redirect_from:
|
||||
- /articles/about-github-business-accounts/
|
||||
@@ -11,37 +11,8 @@ versions:
|
||||
fpt: '*'
|
||||
ghes: '*'
|
||||
topics:
|
||||
- Accounts
|
||||
- Enterprise
|
||||
---
|
||||
## About enterprise accounts
|
||||
|
||||
An enterprise account allows you to manage multiple {% data variables.product.prodname_dotcom %} organizations and {% data variables.product.prodname_ghe_server %} instances. Your enterprise account must have a handle, like an organization or personal account on {% data variables.product.prodname_dotcom %}. Enterprise administrators can manage settings and preferences, like:
|
||||
|
||||
- Member access and management (organization members, outside collaborators)
|
||||
- Billing and usage ({% data variables.product.prodname_ghe_server %} instances, user licenses, {% data variables.large_files.product_name_short %} packs{% ifversion fpt or ghes > 3.0 %}, {% data variables.product.prodname_GH_advanced_security %} usage{% endif %})
|
||||
- Security (single sign-on, two factor authentication)
|
||||
- Requests and support bundle sharing with {% data variables.contact.enterprise_support %}
|
||||
|
||||
{% data reusables.enterprise-accounts.enterprise-accounts-billing %} For more information about managing your {% data variables.product.prodname_ghe_cloud %} subscription, see "[Viewing the subscription and usage for your enterprise account](/articles/viewing-the-subscription-and-usage-for-your-enterprise-account)." For more information about managing your {% data variables.product.prodname_ghe_server %} billing settings, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)."
|
||||
|
||||
For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." To upgrade to {% data variables.product.prodname_enterprise %} or to get started with an enterprise account, contact {% data variables.contact.contact_enterprise_sales %}.
|
||||
|
||||
For more information about member access and management, see "{% ifversion fpt %}[Managing users in your enterprise](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise){% elsif ghae or ghes %}[Managing users, organizations, and repositories](/admin/user-management){% endif %}."
|
||||
|
||||
For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/graphql/guides/managing-enterprise-accounts)."
|
||||
|
||||
{% ifversion fpt %}
|
||||
|
||||
## Managing organizations linked to your enterprise account
|
||||
|
||||
Organizations are shared accounts where groups of people can collaborate across many projects at once. Owners can manage member access to the organization's data and projects with sophisticated security and administrative features. For more information, see "[About organizations](/articles/about-organizations)."
|
||||
|
||||
Enterprise owners can create organizations and link them to the enterprise. After you add organizations to your enterprise account, you can manage and enforce the organizations' policies. Specific enforcement options vary by setting; generally, you can choose to enforce a single policy for every organization in your enterprise account or allow owners to set policy on the organization level.
|
||||
|
||||
For more information, see "[Managing organizations in your enterprise account](/articles/managing-organizations-in-your-enterprise-account)" and "[Setting policies for organizations in your enterprise account](/articles/setting-policies-for-organizations-in-your-enterprise-account)."
|
||||
|
||||
{% endif %}
|
||||
|
||||
## Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account
|
||||
|
||||
{% data reusables.enterprise-accounts.admin-managing-licenses %}
|
||||
{% data reusables.enterprise-accounts.about-enterprise-accounts %}
|
||||
|
||||
@@ -11,7 +11,6 @@ topics:
|
||||
children:
|
||||
- /about-enterprise-accounts
|
||||
- /verifying-or-approving-a-domain-for-your-enterprise-account
|
||||
- /viewing-the-subscription-and-usage-for-your-enterprise-account
|
||||
- /managing-licenses-for-visual-studio-subscription-with-github-enterprise
|
||||
- /connecting-an-azure-subscription-to-your-enterprise
|
||||
shortTitle: Manage your enterprise
|
||||
|
||||
@@ -44,7 +44,7 @@ For more information, see "[Inviting users to join your organization](/organizat
|
||||
|
||||
## 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/viewing-the-subscription-and-usage-for-your-enterprise-account)."
|
||||
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](/billing/managing-billing-for-your-github-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](/github/setting-up-and-managing-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators)."
|
||||
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
---
|
||||
title: Viewing the subscription and usage for your enterprise account
|
||||
intro: 'You can view the current subscription, license usage, invoices, payment history, and other billing information for your enterprise account.'
|
||||
product: '{% data reusables.gated-features.enterprise-accounts %}'
|
||||
permissions: Enterprise owners and billing managers can access and manage all billing settings for enterprise accounts.
|
||||
redirect_from:
|
||||
- /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
|
||||
- /articles/viewing-the-subscription-and-usage-for-your-enterprise-account
|
||||
- /github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account
|
||||
versions:
|
||||
fpt: '*'
|
||||
ghes: '*'
|
||||
topics:
|
||||
- Enterprise
|
||||
shortTitle: View subscription & usage
|
||||
---
|
||||
## About billing for enterprise accounts
|
||||
|
||||
Enterprise accounts are currently available to {% data variables.product.prodname_enterprise %} customers paying by invoice. Billing for all of the organizations and {% data variables.product.prodname_ghe_server %} instances connected to your enterprise account are aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services (including paid licenses in organizations, {% data variables.large_files.product_name_long %} data packs,{% ifversion fpt or ghes > 3.0 %} {% data variables.product.prodname_GH_advanced_security %} usage,{% endif %} and subscriptions for {% data variables.product.prodname_marketplace %} apps).
|
||||
|
||||
{% ifversion fpt %}{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."{% endif %}
|
||||
|
||||
For more information about managing billing managers, see "[Inviting people to manage your enterprise](/github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise)."
|
||||
|
||||
## Viewing the subscription and usage for your enterprise account
|
||||
|
||||
{% data reusables.enterprise-accounts.access-enterprise %}
|
||||
{% data reusables.enterprise-accounts.settings-tab %}
|
||||
{% data reusables.enterprise-accounts.license-tab %}
|
||||
1. Under "User {% ifversion fpt %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date.
|
||||
{% ifversion fpt %}{% else %}
|
||||
{% endif %}
|
||||
1. Optionally, to view details for license usage or download a {% ifversion fpt %}CSV{% elsif ghes %}JSON{% endif %} file with license details{% ifversion fpt %}, to the right of "User Licenses"{% endif %}, click **View {% ifversion fpt %}details{% elsif ghes %}users{% endif %}** or {% ifversion fpt %}{% octicon "download" aria-label="The download icon" %}{% elsif ghes %}**Export license usage**{% endif %}.{% ifversion fpt %}
|
||||
{% endif %}
|
||||
{% ifversion fpt or ghes > 3.0 %}
|
||||
1. Optionally, to view usage details for other features, in the left sidebar, click **Billing**.
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% ifversion fpt %}
|
||||
## Further reading
|
||||
|
||||
- "[About billing for GitHub Actions](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#about-billing-for-github-actions)"
|
||||
- "[About billing for Git Large File Storage](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)"
|
||||
- "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security)"
|
||||
|
||||
{% endif %}
|
||||
Reference in New Issue
Block a user