From daf6a54e64e1e1799183f322acd25490fb364f23 Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Thu, 15 Dec 2022 10:47:55 -0600 Subject: [PATCH] Create "About GitHub Enterprise Cloud" (#33284) --- content/admin/index.md | 2 +- .../overview/about-github-enterprise-cloud.md | 46 +++++++++++++++++++ .../overview/about-github-for-enterprises.md | 2 +- content/admin/overview/index.md | 2 + .../learning-about-github/githubs-products.md | 33 ++++++------- ...ng-started-with-github-enterprise-cloud.md | 5 +- ...g-up-a-trial-of-github-enterprise-cloud.md | 2 +- data/reusables/docs/ghec-docs.md | 1 + data/reusables/enterprise/about-ghec.md | 1 + .../enterprise/ghe-includes-ghec-and-ghes.md | 1 + 10 files changed, 71 insertions(+), 24 deletions(-) create mode 100644 content/admin/overview/about-github-enterprise-cloud.md create mode 100644 data/reusables/docs/ghec-docs.md create mode 100644 data/reusables/enterprise/about-ghec.md create mode 100644 data/reusables/enterprise/ghe-includes-ghec-and-ghes.md diff --git a/content/admin/index.md b/content/admin/index.md index 24597e8da2..c7d2c76233 100644 --- a/content/admin/index.md +++ b/content/admin/index.md @@ -64,7 +64,7 @@ redirect_from: - /insights/installing-and-configuring-github-insights/managing-data-in-github-insights/managing-repositories - /admin/configuration/configuring-your-enterprise/configuring-data-encryption-for-your-enterprise introLinks: - overview: '{% ifversion ghes %}/admin/overview/about-github-enterprise-server{% elsif ghae %}/admin/overview/about-github-ae{% elsif ghec %}/admin/overview/about-enterprise-accounts{% endif %}' + overview: '{% ifversion ghes %}/admin/overview/about-github-enterprise-server{% elsif ghae %}/admin/overview/about-github-ae{% elsif ghec %}/admin/overview/about-github-enterprise-cloud{% endif %}' Releases: '{% ifversion ghes %}/admin/all-releases{% endif %}' changelog: label: enterprise diff --git a/content/admin/overview/about-github-enterprise-cloud.md b/content/admin/overview/about-github-enterprise-cloud.md new file mode 100644 index 0000000000..ee0638e21e --- /dev/null +++ b/content/admin/overview/about-github-enterprise-cloud.md @@ -0,0 +1,46 @@ +--- +title: About GitHub Enterprise Cloud +intro: "{% data reusables.enterprise.about-ghec %}" +versions: + ghec: '*' +type: overview +topics: + - Enterprise + - Fundamentals +--- + +## About {% data variables.product.product_name %} + +{% data variables.product.product_name %} adds advanced functionality to {% data variables.product.prodname_dotcom_the_website %}, such as SAML authentication, additional {% data variables.product.prodname_actions %} minutes, the ability to restrict email notifications to verified domains, and privately published {% data variables.product.prodname_pages %} sites. For a full list of features included with {% data variables.product.product_name %}, see our [Pricing](https://github.com/pricing) page. + +One of the main differences between {% data variables.product.product_name %} and other plans for {% data variables.product.prodname_dotcom_the_website %} is access to an enterprise account. Enterprise accounts provide administrators with a single point of visibility and management across multiple organizations. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)." + +{% data reusables.enterprise.ghe-includes-ghec-and-ghes %} For more information about {% data variables.product.prodname_ghe_server %} and how it differs from {% data variables.product.prodname_ghe_cloud %}, see "[About {% data variables.product.prodname_dotcom %} for enterprises](/admin/overview/about-github-for-enterprises#about-deployment-options)." + +## About identity and access management + +Before you start using {% data variables.product.product_name %}, you must decide whether you want to allow your developers to create and manage their own personal accounts, or whether you want to use {% data variables.product.prodname_emus %}, which allows you to create and manage the user accounts for your developers through your IdP. + +If you choose {% data variables.product.prodname_emus %}, all user accounts must be provisioned by a supported IdP via SCIM, and you can manage team and organization membership via your IdP, too. {% data variables.enterprise.prodname_managed_users_caps %} are strongly restricted in their ability to contribute outside of your enterprise. + +If you choose not to use {% data variables.product.prodname_emus %}, your developers will create their own personal accounts on {% data variables.product.prodname_dotcom_the_website %}, but you can optionally require SAML authentication before those personal accounts can access your enterprise's resources. + +To help you decide which choice is best for your enterprise, see "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise)." + +## About documentation + +Documentation for both administrators and users of {% data variables.product.product_name %} is available on this site, {% data variables.product.prodname_docs %}. + +- [Enterprise administrator documentation](/admin) +- [User documentation](/) + +{% data reusables.docs.ghec-docs %} + +## Trying {% data variables.product.product_name %} + +You can sign up for a free, 30-day trial of {% data variables.product.product_name %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_cloud %}](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)." + +## Further reading + +- "[Getting started with {% data variables.product.prodname_ghe_cloud %}](/get-started/onboarding/getting-started-with-github-enterprise-cloud)" +- [ {% data variables.product.prodname_roadmap %} ]( {% data variables.product.prodname_roadmap_link %} ) in the `github/roadmap` repository diff --git a/content/admin/overview/about-github-for-enterprises.md b/content/admin/overview/about-github-for-enterprises.md index 3d931c7b12..27abbdf8ff 100644 --- a/content/admin/overview/about-github-for-enterprises.md +++ b/content/admin/overview/about-github-for-enterprises.md @@ -25,7 +25,7 @@ Optionally, you can add extra code security features with {% data variables.prod ## About deployment options -When you purchase {% data variables.product.prodname_enterprise %}, you get access to both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_ghe_cloud %} is a set of advanced functionality on {% data variables.product.prodname_dotcom_the_website %}, while {% data variables.product.prodname_ghe_server %} is self-hosted platform. For more information, see "[About {% data variables.product.prodname_ghe_server %}]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/overview/about-github-enterprise-server){% ifversion not ghes %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}."{% endif %} +{% data reusables.enterprise.ghe-includes-ghec-and-ghes %} {% data variables.product.prodname_ghe_cloud %} is a set of advanced functionality on {% data variables.product.prodname_dotcom_the_website %}, while {% data variables.product.prodname_ghe_server %} is self-hosted platform. For more information, see "[About {% data variables.product.prodname_ghe_cloud %}](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud)"{% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud%} documentation{% endif %} and "[About {% data variables.product.prodname_ghe_server %}]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/overview/about-github-enterprise-server){% ifversion not ghes %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}."{% endif %} For {% data variables.product.prodname_ghe_cloud %}, you can allow developers to create and manage their own personal accounts, or you can use {% data variables.product.prodname_emus %}, which enables you to create and manage the user accounts for your developers. For more information, see "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise)." diff --git a/content/admin/overview/index.md b/content/admin/overview/index.md index 2865ffd5e6..940d350bfb 100644 --- a/content/admin/overview/index.md +++ b/content/admin/overview/index.md @@ -9,6 +9,7 @@ versions: ghae: '*' children: - /about-github-for-enterprises + - /about-github-enterprise-cloud - /about-github-enterprise-server - /about-github-ae - /about-upgrades-to-new-releases @@ -20,4 +21,5 @@ children: - /creating-an-enterprise-account - /accessing-compliance-reports-for-your-enterprise --- + 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/get-started/learning-about-github/githubs-products.md b/content/get-started/learning-about-github/githubs-products.md index 6951b466f4..f5081a5ef6 100644 --- a/content/get-started/learning-about-github/githubs-products.md +++ b/content/get-started/learning-about-github/githubs-products.md @@ -34,7 +34,7 @@ With {% data variables.product.prodname_free_user %}, your personal account incl - {% data variables.product.prodname_gcf %} - {% data variables.product.prodname_dependabot_alerts %} - Two-factor authentication enforcement -- 2,000 {% data variables.product.prodname_actions %} minutes per month +- 2,000 {% data variables.product.prodname_actions %} minutes per month - 500 MB {% data variables.product.prodname_registry %} storage {% ifversion fpt or ghec%} - 120 {% data variables.product.prodname_github_codespaces %} core hours per month - 15 GB {% data variables.product.prodname_github_codespaces %} storage per month {% endif %} @@ -43,7 +43,7 @@ With {% data variables.product.prodname_free_user %}, your personal account incl In addition to the features available with {% data variables.product.prodname_free_user %} for personal accounts, {% data variables.product.prodname_pro %} includes: - {% data variables.contact.github_support %} via email -- 3,000 {% data variables.product.prodname_actions %} minutes per month +- 3,000 {% data variables.product.prodname_actions %} minutes per month - 2 GB {% data variables.product.prodname_registry %} storage {% ifversion fpt or ghec%} - 180 {% data variables.product.prodname_github_codespaces %} core hours per month - 20 GB {% data variables.product.prodname_github_codespaces %} storage per month {% endif %} @@ -65,15 +65,15 @@ In addition to the features available with {% data variables.product.prodname_fr - {% data variables.product.prodname_gcf %} - Team discussions - Team access controls for managing groups -- 2,000 {% data variables.product.prodname_actions %} minutes per month -- 500 MB {% data variables.product.prodname_registry %} storage +- 2,000 {% data variables.product.prodname_actions %} minutes per month +- 500 MB {% data variables.product.prodname_registry %} storage ## {% data variables.product.prodname_team %} In addition to the features available with {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %} includes: - {% data variables.contact.github_support %} via email -- 3,000 {% data variables.product.prodname_actions %} minutes per month -- 2 GB {% data variables.product.prodname_registry %} storage +- 3,000 {% data variables.product.prodname_actions %} minutes per month +- 2 GB {% data variables.product.prodname_registry %} storage - Advanced tools and insights in private repositories: - Required pull request reviewers - Multiple pull request reviewers @@ -96,9 +96,10 @@ In addition to the features available with {% data variables.product.prodname_fr ## {% data variables.product.prodname_enterprise %} -{% data variables.product.prodname_enterprise %} includes two deployment options: cloud-hosted and self-hosted. +{% data variables.product.prodname_enterprise %} includes two deployment options: {% data variables.product.prodname_ghe_cloud %}, which is cloud-hosted and part of {% data variables.product.prodname_dotcom_the_website %}, and {% data variables.product.prodname_ghe_server %}, which is self-hosted. For more information, see "[About {% data variables.product.prodname_dotcom %} for enterprises]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/overview/about-github-for-enterprises){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} In addition to the features available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_enterprise %} includes: + - {% data variables.contact.enterprise_support %} - Additional security, compliance, and deployment controls - Authentication with SAML single sign-on @@ -106,21 +107,15 @@ In addition to the features available with {% data variables.product.prodname_te - {% data variables.product.prodname_github_connect %} - The option to purchase {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)." -{% data variables.product.prodname_ghe_cloud %} also includes: -- {% data variables.contact.enterprise_support %}. For more information, see "{% data variables.product.prodname_ghe_cloud %} support" and "{% data variables.product.prodname_ghe_cloud %} Addendum." -- 50,000 {% data variables.product.prodname_actions %} minutes per month -- 50 GB {% data variables.product.prodname_registry %} storage -- Access control for {% data variables.product.prodname_pages %} sites. For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/enterprise-cloud@latest/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site)." +{% data variables.product.prodname_ghe_cloud %} specifically includes: +- 50,000 {% data variables.product.prodname_actions %} minutes per month +- 50 GB {% data variables.product.prodname_registry %} storage - A service level agreement for 99.9% monthly uptime -- The option to configure your enterprise for {% data variables.product.prodname_emus %}, so you can provision and manage members with your identity provider and restrict your member's contributions to just your enterprise. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)." - The option to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations with an enterprise account. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)." +- The option to provision and manage the user accounts for your developers, by using {% data variables.product.prodname_emus %}. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)." -{% data reusables.enterprise.about-github-for-enterprises %} - -You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_cloud %}](/enterprise-cloud@latest/articles/setting-up-a-trial-of-github-enterprise-cloud)." - -For more information about hosting your own instance of {% data variables.product.prodname_ghe_server %}, including setting up a trial, see "[About {% data variables.product.prodname_ghe_server %}](/enterprise-server/admin/overview/about-github-enterprise-server)." +You can set up trials to evaluate {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_cloud %}](/enterprise-cloud@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)" and "[Setting up a trial of {% data variables.product.prodname_ghe_server %}](/enterprise-server@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server)." ## Further reading -- "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing)"{% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} +- "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing)"{% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} diff --git a/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md b/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md index ad6be77621..8011f19110 100644 --- a/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md +++ b/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md @@ -19,7 +19,7 @@ This guide will walk you through setting up, configuring and managing your {% da The main difference between the products is that {% data variables.product.prodname_ghe_cloud %} is hosted by {% data variables.product.prodname_dotcom %}, while {% data variables.product.prodname_ghe_server %} is self-hosted. -{% data reusables.enterprise.about-github-for-enterprises %} +For more information about {% data variables.product.prodname_ghe_cloud %}, see "[About {% data variables.product.prodname_ghe_cloud %}](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud)." With {% data variables.product.prodname_ghe_cloud %}, you have the option of using {% data variables.product.prodname_emus %}. {% data reusables.enterprise-accounts.emu-short-summary %} @@ -203,7 +203,8 @@ Members of your organization or enterprise can use tools from the {% data variab Members of your organization or enterprise can use GitHub's learning and support resources to get the help they need. You can also support the open source community. ### 1. Reading about {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_docs %} -You can read documentation that reflects the features available with {% data variables.product.prodname_ghe_cloud %}. For more information, see "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs)." + +{% data reusables.docs.ghec-docs %} {% data reusables.enterprise.best-practices %} diff --git a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md index 8da3c8a6db..b3e091e2e5 100644 --- a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md +++ b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md @@ -19,7 +19,7 @@ shortTitle: Enterprise Cloud trial ## About {% data variables.product.prodname_ghe_cloud %} -{% data variables.product.prodname_ghe_cloud %} is a plan for large businesses or teams who collaborate on {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise.about-github-for-enterprises %} +{% data reusables.enterprise.about-ghec %} For more information, see "[About {% data variables.product.prodname_ghe_cloud %}](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud)." {% data reusables.organizations.about-organizations %} For more information about accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)." diff --git a/data/reusables/docs/ghec-docs.md b/data/reusables/docs/ghec-docs.md new file mode 100644 index 0000000000..870b5ad80b --- /dev/null +++ b/data/reusables/docs/ghec-docs.md @@ -0,0 +1 @@ +You can read documentation that reflects the features available with {% data variables.product.prodname_ghe_cloud %}. For more information, see "[About versions of {% data variables.product.prodname_docs %}](/get-started/learning-about-github/about-versions-of-github-docs)." diff --git a/data/reusables/enterprise/about-ghec.md b/data/reusables/enterprise/about-ghec.md new file mode 100644 index 0000000000..3ae8b856df --- /dev/null +++ b/data/reusables/enterprise/about-ghec.md @@ -0,0 +1 @@ +{% data variables.product.prodname_ghe_cloud %} is designed for large businesses or teams who collaborate on {% data variables.product.prodname_dotcom_the_website %}. \ No newline at end of file diff --git a/data/reusables/enterprise/ghe-includes-ghec-and-ghes.md b/data/reusables/enterprise/ghe-includes-ghec-and-ghes.md new file mode 100644 index 0000000000..d86f184e8d --- /dev/null +++ b/data/reusables/enterprise/ghe-includes-ghec-and-ghes.md @@ -0,0 +1 @@ +When you purchase {% data variables.product.prodname_enterprise %}, you get access to both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. \ No newline at end of file