diff --git a/content/admin/guides.md b/content/admin/guides.md index 99fa2d1ae1..1cf15e57b0 100644 --- a/content/admin/guides.md +++ b/content/admin/guides.md @@ -136,7 +136,7 @@ includeGuides: - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/rebuilding-contributions-data - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization - /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users - - /admin/overview/creating-an-enterprise-account + - /admin/managing-your-enterprise-account/creating-an-enterprise-account - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/restoring-a-deleted-organization - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console - /admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console diff --git a/content/admin/index.md b/content/admin/index.md index 14be42e6b1..beece0999a 100644 --- a/content/admin/index.md +++ b/content/admin/index.md @@ -111,6 +111,7 @@ versions: ghae: '*' children: - /overview + - /managing-your-enterprise-account - /installation - /configuration - /administering-your-instance diff --git a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md index b2c6871a27..cfac0c69b7 100644 --- a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md +++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md @@ -24,7 +24,7 @@ Your enterprise account can own organizations. Members of your enterprise can co You can add new organizations to your enterprise account. If you do not use {% data variables.product.prodname_emus %}, you can add existing organizations on {% data variables.location.product_location %} to your enterprise. You cannot add an existing organization from an {% data variables.enterprise.prodname_emu_enterprise %} to a different enterprise. -{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/admin/overview/creating-an-enterprise-account)." +{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/admin/managing-your-enterprise-account/creating-an-enterprise-account)." After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply. diff --git a/content/admin/overview/creating-an-enterprise-account.md b/content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md similarity index 98% rename from content/admin/overview/creating-an-enterprise-account.md rename to content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md index b710f3b515..3bbc540ea9 100644 --- a/content/admin/overview/creating-an-enterprise-account.md +++ b/content/admin/managing-your-enterprise-account/creating-an-enterprise-account.md @@ -10,6 +10,8 @@ topics: - Fundamentals permissions: Organization owners can create an enterprise account. shortTitle: Create enterprise account +redirect_from: + - /admin/overview/creating-an-enterprise-account --- ## About enterprise account creation diff --git a/content/admin/overview/deleting-an-enterprise-account.md b/content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md similarity index 93% rename from content/admin/overview/deleting-an-enterprise-account.md rename to content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md index 103fbe0686..958d9c26c3 100644 --- a/content/admin/overview/deleting-an-enterprise-account.md +++ b/content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md @@ -1,6 +1,6 @@ --- title: Deleting an enterprise account -intro: "You can delete an enterprise account to stop paying for {% data variables.product.prodname_enterprise %}." +intro: 'You can delete an enterprise account to stop paying for {% data variables.product.prodname_enterprise %}.' versions: ghec: '*' type: how_to @@ -10,6 +10,8 @@ topics: - Fundamentals permissions: Enterprise owners can delete an enterprise account if the company pays by credit card or PayPal. shortTitle: Delete enterprise account +redirect_from: + - /admin/overview/deleting-an-enterprise-account --- ## About enterprise account deletion diff --git a/content/admin/managing-your-enterprise-account/index.md b/content/admin/managing-your-enterprise-account/index.md new file mode 100644 index 0000000000..fa8b78e583 --- /dev/null +++ b/content/admin/managing-your-enterprise-account/index.md @@ -0,0 +1,10 @@ +--- +title: Managing your enterprise account +intro: You can use an enterprise account to centrally manage multiple organizations. +versions: + ghec: '*' +children: + - /creating-an-enterprise-account + - /deleting-an-enterprise-account +shortTitle: Manage enterprise account +--- diff --git a/content/admin/overview/about-enterprise-accounts.md b/content/admin/overview/about-enterprise-accounts.md index e20acdcbf8..74a71b0f0b 100644 --- a/content/admin/overview/about-enterprise-accounts.md +++ b/content/admin/overview/about-enterprise-accounts.md @@ -42,7 +42,7 @@ Your enterprise account allows you to manage and enforce policies for all the or {% ifversion ghec %} -{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/admin/overview/creating-an-enterprise-account)." +{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/admin/managing-your-enterprise-account/creating-an-enterprise-account)." {% endif %} diff --git a/content/admin/overview/index.md b/content/admin/overview/index.md index b97418be10..73e101a8f4 100644 --- a/content/admin/overview/index.md +++ b/content/admin/overview/index.md @@ -20,9 +20,7 @@ children: - /system-overview - /about-the-github-enterprise-api - /best-practices-for-enterprises - - /creating-an-enterprise-account - /accessing-compliance-reports-for-your-enterprise - - /deleting-an-enterprise-account --- For more information, or to purchase {% data variables.product.prodname_enterprise %}, see [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise). diff --git a/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md b/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md index ad49721af6..cda366cbe8 100644 --- a/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md +++ b/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md @@ -96,7 +96,7 @@ Enterprise accounts are only available with {% data variables.product.prodname_e To downgrade the plan of an individual organization within the enterprise account, you must remove the organization from the enterprise account. Removing an organization from an enterprise automatically downgrades the organization to {% data variables.product.prodname_free_team %}. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)." -If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether and your company pays via invoice, contact {% data variables.contact.contact_enterprise_sales %}. If your company pays for {% data variables.product.prodname_enterprise %} by credit card or PayPal, an enterprise owner can delete the enterprise account. For more information, see "[AUTOTITLE](/admin/overview/deleting-an-enterprise-account)." +If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether and your company pays via invoice, contact {% data variables.contact.contact_enterprise_sales %}. If your company pays for {% data variables.product.prodname_enterprise %} by credit card or PayPal, an enterprise owner can delete the enterprise account. For more information, see "[AUTOTITLE](/admin/managing-your-enterprise-account/creating-an-enterprise-account)." ## Removing paid seats for your enterprise account diff --git a/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md index b52293bfbb..59d8b7fc55 100644 --- a/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md +++ b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md @@ -85,7 +85,7 @@ Upgrading an organization does not affect your personal account or repositories As part of your upgrade to {% data variables.product.prodname_ghe_cloud %}, you set up an enterprise account on {% data variables.location.product_location %}. An enterprise account allows you to manage multiple organizations. Optionally, you can set up identity and access management for an individual organization or enterprise account. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" and "[AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#authentication-through-githubcom-with-additional-saml-access-restriction){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} -{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} +{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-an-enterprise-account){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} ### Adding seats to your organization diff --git a/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 7f0292d958..0fac288144 100644 --- a/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -18,7 +18,7 @@ shortTitle: View subscription & usage ## About billing for enterprise accounts -You can view an overview of {% ifversion ghec %}your subscription and paid{% elsif ghes %}the license{% endif %} usage for {% ifversion ghec %}your{% elsif ghes %}the{% endif %} enterprise account on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}.{% ifversion ghec %} {% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account)."{% endif %} +You can view an overview of {% ifversion ghec %}your subscription and paid{% elsif ghes %}the license{% endif %} usage for {% ifversion ghec %}your{% elsif ghes %}the{% endif %} enterprise account on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}.{% ifversion ghec %} {% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-an-enterprise-account)."{% endif %} For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.product.product_name %}{% endif %}, you may have usage for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghec %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% endif %} diff --git a/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md b/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md index d00c818bba..ace4228f98 100644 --- a/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md +++ b/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md @@ -48,7 +48,7 @@ You can see your current usage in your [Azure account portal](https://portal.azu When you use an enterprise account on {% data variables.location.product_location %}, the enterprise account is the central point for all billing within your enterprise, including the organizations that your enterprise owns. -If you use {% data variables.product.product_name %} with an individual organization and do not yet have an enterprise account, you create an enterprise account and add your organization. For more information, see "[AUTOTITLE](/admin/overview/creating-an-enterprise-account)." +If you use {% data variables.product.product_name %} with an individual organization and do not yet have an enterprise account, you create an enterprise account and add your organization. For more information, see "[AUTOTITLE](/admin/managing-your-enterprise-account/creating-an-enterprise-account)." {% data variables.product.company_short %} bills monthly for the total number of licensed seats for your enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. If you use a standalone organization on {% data variables.product.product_name %}, you'll be billed at the organization level for all usage. For more information your bill's license seats, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)." diff --git a/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md b/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md index 87e87576c6..2943293bc5 100644 --- a/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md +++ b/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md @@ -28,5 +28,5 @@ When you create a personal account or organization, you must select a billing pl ## Next steps - "[AUTOTITLE](/get-started/signing-up-for-github/verifying-your-email-address)" -- "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} +- "[AUTOTITLE](/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-an-enterprise-account)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} - [ {% data variables.product.prodname_roadmap %} ]( {% data variables.product.prodname_roadmap_link %} ) in the `github/roadmap` repository diff --git a/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md b/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md index b44f15ceb2..2847a712d8 100644 --- a/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md @@ -45,7 +45,7 @@ Enterprise accounts are a feature of {% data variables.product.prodname_ghe_clou {% ifversion ghec %}For organizations that belong to an enterprise account, billing is managed at the enterprise account level, and billing settings are not available at the organization level.{% endif %} Enterprise owners can set policy for all organizations in the enterprise account or allow organization owners to set the policy at the organization level. Organization owners cannot change settings enforced for your organization at the enterprise account level. If you have questions about a policy or setting for your organization, contact the owner of your enterprise account. {% ifversion ghec %} -{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/admin/overview/creating-an-enterprise-account)." +{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/admin/managing-your-enterprise-account/creating-an-enterprise-account)." {% data reusables.enterprise-accounts.invite-organization %}