From 924d688ae435824f35e314cb3313a24c88c6a4ef Mon Sep 17 00:00:00 2001 From: Andrew McCoy Date: Thu, 21 Jan 2021 09:50:22 -0500 Subject: [PATCH 1/7] updating doc with links for licenses The experiance for new users is not very obvious as to `where` they will receive their license. I've included links for Download and Install to help the user find the information. I will be adding another commit when I have fleshed out the various ways that users get the GHES license. --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index 701d4e32d5fb..496cd4bd8633 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you [download](https://enterprise.github.com/releases/) and [install](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance) {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From fe03b0b1fb09e914a81f276b74361e7a401c9bda Mon Sep 17 00:00:00 2001 From: Andrew McCoy Date: Thu, 21 Jan 2021 10:02:36 -0500 Subject: [PATCH 2/7] Update managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index 496cd4bd8633..4c710de910aa 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -24,6 +24,8 @@ You can allocate the user licenses included in your {% data variables.product.pr If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. +You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can login to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. + ### Uploading a new license to {% data variables.product.prodname_ghe_server %} After you purchase a new license or upgrade an existing license from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file, then upload the file to {% data variables.product.prodname_ghe_server %} to unlock your new user licenses. From a41a4500baa30d2e36268dc43e1a634445618815 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:05:34 +0000 Subject: [PATCH 3/7] Apply suggestions from code review --- .../overview/managing-your-github-enterprise-license.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index 8bb8cc46e134..edbdef1c5b84 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,13 +18,14 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you [download](https://enterprise.github.com/releases/) and [install](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance) {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.prodname_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." + You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. -You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can login to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. +You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can log in to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. ### Uploading a new license to {% data variables.product.prodname_ghe_server %} From 2bea63038afb77818dd4cb844cedba2e5f79e2ee Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:20:20 +0000 Subject: [PATCH 4/7] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index edbdef1c5b84..c8a9811df18f 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.prodname_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product_location_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From 19cbc391e5b4e47244e07b0ace56472b402b9ea7 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:28:38 +0000 Subject: [PATCH 5/7] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index c8a9811df18f..d542622b5ec6 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product_location_enterprise %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From b5815e554746aebb41ff1dd706b5fcf28a890b85 Mon Sep 17 00:00:00 2001 From: Meg Bird Date: Wed, 3 Mar 2021 14:44:43 -0700 Subject: [PATCH 6/7] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index d542622b5ec6..d1fbc6bf44b0 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -18,7 +18,7 @@ versions: ### About {% data variables.product.prodname_enterprise %} licenses -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance)." +When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)." You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. From 457d2ee5d1358284e7bc6624312342461731ac98 Mon Sep 17 00:00:00 2001 From: Meg Bird Date: Wed, 3 Mar 2021 14:44:49 -0700 Subject: [PATCH 7/7] Update content/admin/overview/managing-your-github-enterprise-license.md --- .../admin/overview/managing-your-github-enterprise-license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md index d1fbc6bf44b0..b5c69a8999af 100644 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ b/content/admin/overview/managing-your-github-enterprise-license.md @@ -25,7 +25,7 @@ You can allocate the user licenses included in your {% data variables.product.pr If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. -You can download your {% data variables.product.prodname_ghe_server %} license from your [Enterprise Account](https://docs.github.com/en/enterprise-server/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server), if you do not have an Enterprise Account you can log in to our [Enterprise Portal](https://enterprise.github.com/download) and download your license. +You can download your {% data variables.product.prodname_ghe_server %} license from your [enterprise account](https://enterprise.github.com/download). For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/admin/overview/managing-your-github-enterprise-license#uploading-a-new-license-to-github-enterprise-server)." ### Uploading a new license to {% data variables.product.prodname_ghe_server %}