From 5abae2ca2ee8e58d0b7c55cc7f5fad2ea2a154af Mon Sep 17 00:00:00 2001 From: David Losert Date: Mon, 3 Apr 2023 11:03:02 +0200 Subject: [PATCH] Clarifies Copilot subscription for Customers under MSFT EA (#35762) Co-authored-by: hubwriter --- ...ion-for-your-organization-or-enterprise.md | 11 ++++++ ...n-azure-subscription-to-your-enterprise.md | 8 ++-- content/copilot/quickstart.md | 38 +++++++++++++++---- .../copilot/enabling-in-enterprise.md | 11 ++++++ .../signup-procedure-enterprise-msft-ea.md | 1 + .../copilot/signup-procedure-enterprise.md | 11 ------ .../billing-microsoft-ea-overview.md | 2 +- 7 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 data/reusables/copilot/enabling-in-enterprise.md create mode 100644 data/reusables/copilot/signup-procedure-enterprise-msft-ea.md diff --git a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md index f2d21a4ad4..9d448d579e 100644 --- a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md +++ b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md @@ -25,15 +25,26 @@ You can set up a {% data variables.product.prodname_copilot_for_business %} subs Before you can start using {% data variables.product.prodname_copilot_business_short %} in your enterprise, you will need to set up a subscription. +### Customers under a Microsoft Enterprise Agreement + +{% data reusables.copilot.signup-procedure-enterprise-msft-ea %} + +### Customers under a direct GitHub contract + {% data reusables.copilot.signup-procedure-enterprise %} {% endif %} + +{% ifversion fpt %} + ## Setting up a {% data variables.product.prodname_copilot_business_short %} subscription for your organization Before you can start using {% data variables.product.prodname_copilot %} in your organization account, you will need to set up a subscription. {% data reusables.copilot.signup-procedure-org %} +{% endif %} + ## Modifying your {% data variables.product.prodname_copilot_business_short %} subscription {% ifversion ghec %} diff --git a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md b/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md index c0844cc1c6..56541592fa 100644 --- a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md +++ b/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md @@ -1,6 +1,6 @@ --- title: Connecting an Azure subscription to your enterprise -intro: 'You can use your Microsoft Enterprise Agreement to enable and pay for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_github_codespaces %} usage.' +intro: 'You can use your Microsoft Enterprise Agreement to enable and pay for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, {% data variables.product.prodname_github_codespaces %} usage and {% data variables.product.prodname_copilot_business_short %}.' redirect_from: - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise - /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise @@ -11,11 +11,11 @@ shortTitle: Connect an Azure subscription --- ## About Azure subscriptions and {% data variables.product.product_name %} -{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) and "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)." +{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)," "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)," and "[AUTOTITLE](/billing/managing-billing-for-github-copilot)." {% note %} -**Note:** If your enterprise account is on a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} beyond the included amounts, or to use {% data variables.product.prodname_github_codespaces %} at all. +**Note:** If your enterprise account is on a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} beyond the included amounts, or to use {% data variables.product.prodname_github_codespaces %} and {% data variables.product.prodname_copilot_business_short %} at all. {% endnote %} @@ -36,7 +36,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc 1. Under "Payment Information", click **Add Azure Subscription**. 1. To sign in to your Microsoft account, follow the prompts. 1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. -1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your enterprise. +1. Under "Select a subscription", select the Azure subscription ID that you want to connect to your enterprise. {% note %} diff --git a/content/copilot/quickstart.md b/content/copilot/quickstart.md index 2d93c3f2bc..8a1d1f6b97 100644 --- a/content/copilot/quickstart.md +++ b/content/copilot/quickstart.md @@ -29,19 +29,42 @@ Before you can start using {% data variables.product.prodname_copilot %}, you wi **Note:** As a member of an organization owned by a {% data variables.product.prodname_ghe_cloud %} account with a {% data variables.product.prodname_copilot %} subscription, you must be assigned a {% data variables.product.prodname_copilot %} seat by your organization before you can use {% data variables.product.prodname_copilot %}. {% endnote %} -## Signing up for {% data variables.product.prodname_copilot %} for your organization{% ifversion ghec %} or enterprise{% endif %} account +{% ifversion fpt %} -{% ifversion ghec%} -### Signing up for {% data variables.product.prodname_copilot %} for your enterprise account +## Signing up for {% data variables.product.prodname_copilot %} for your organization account -{% data reusables.copilot.signup-procedure-enterprise %} - -### Signing up for {% data variables.product.prodname_copilot %} for your organization account -{% endif %} Before you can start using {% data variables.product.prodname_copilot %} in your organization account, you will need to set up a subscription. {% data reusables.copilot.signup-procedure-org %} +{% endif %} + +{% ifversion ghec %} + +## Signing up for {% data variables.product.prodname_copilot %} for your enterprise account + +{% note %} + +**Note:** If you already have a payment method set up for your enterprise account and are billed by {% data variables.product.prodname_dotcom %}, you can skip this section. + +{% endnote %} + +### Customers under a Microsoft Enterprise Agreement + +{% data reusables.copilot.signup-procedure-enterprise-msft-ea %} + +### Customers under a direct GitHub contract + +{% data reusables.copilot.signup-procedure-enterprise %} + +## Enabling {% data variables.product.prodname_copilot %} for your enterprise account + +{% data reusables.copilot.enabling-in-enterprise %} + +For more information, see "[AUTOTITLE](/copilot/overview-of-github-copilot/enabling-and-setting-up-github-copilot-for-business)." + +{% endif %} + ## Installing the {% data variables.product.prodname_copilot %} extension for {% data variables.product.prodname_vscode %} @@ -77,7 +100,6 @@ You successfully installed {% data variables.product.prodname_copilot %} and rec - [{% data variables.product.prodname_copilot %}](https://copilot.github.com/): See practical examples of how {% data variables.product.prodname_copilot %} can help you work. - [Configuring {% data variables.product.prodname_copilot %}](/copilot/configuring-github-copilot): These guides provide details on how to configure {% data variables.product.prodname_copilot %} to your personal preferences. - ## Further reading - [AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals) diff --git a/data/reusables/copilot/enabling-in-enterprise.md b/data/reusables/copilot/enabling-in-enterprise.md new file mode 100644 index 0000000000..beff751e5b --- /dev/null +++ b/data/reusables/copilot/enabling-in-enterprise.md @@ -0,0 +1,11 @@ +{% data reusables.enterprise-accounts.policies-tab %} +{% data reusables.enterprise-accounts.copilot-tab %} +1. Under "Suggestions matching public code," click the dropdown menu and select the policy for managing the use of {% data variables.product.prodname_copilot %} suggestions that match public code in your enterprise. You can change the policy later by returning to your {% data variables.product.prodname_copilot_for_business %} settings. + - To allow {% data variables.product.prodname_copilot %} suggestions matching public code, select **Allowed**. + - To block {% data variables.product.prodname_copilot %} suggestions matching public code, select **Blocked**. + - To allow each of your organizations to set their own policy on the use of {% data variables.product.prodname_copilot %} suggestions matching public code, select **No policy (let each organization decide)**. +1. Under "Manage organization access to {% data variables.product.prodname_copilot %}," configure the access for your {% data variables.product.prodname_copilot %} subscription. + - To enable {% data variables.product.prodname_copilot %} for all organizations in your enterprise, both current and future, select **Allow for all organizations**. + - To enable {% data variables.product.prodname_copilot %} for specific organizations, select **Allow for specific organizations**. +1. If you selected **Allow for specific organizations**, select the organizations you want to enable {% data variables.product.prodname_copilot %} for. Alternatively, you can select the organizations you want to disable {% data variables.product.prodname_copilot %} access for. +1. To finish setting up your {% data variables.product.prodname_copilot_for_business %} subscription, click **Save**. Organization administrators will receive an email with instructions on how to add members to {% data variables.product.prodname_copilot %}. diff --git a/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md new file mode 100644 index 0000000000..f1632e7828 --- /dev/null +++ b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md @@ -0,0 +1 @@ +As a customer under a Microsoft Enterprise Agreement, you need to connect your Azure subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)." diff --git a/data/reusables/copilot/signup-procedure-enterprise.md b/data/reusables/copilot/signup-procedure-enterprise.md index 60967ce8ef..ad6c652f42 100644 --- a/data/reusables/copilot/signup-procedure-enterprise.md +++ b/data/reusables/copilot/signup-procedure-enterprise.md @@ -4,14 +4,3 @@ 4. Follow the steps to confirm your payment details, then click **Save**. If you don't have a payment method on file, you'll be prompted to add one. - -5. Click the dropdown menu and select the policy for managing the use of {% data variables.product.prodname_copilot %} suggestions that match public code in your enterprise. You can change the policy later by returning to your {% data variables.product.prodname_copilot_for_business %} settings. - - To allow {% data variables.product.prodname_copilot %} suggestions matching public code, select **Allowed**. - - To block {% data variables.product.prodname_copilot %} suggestions matching public code, select **Blocked**. - - To allow each of your organizations to set their own policy on the use of {% data variables.product.prodname_copilot %} suggestions matching public code, select **No policy (let each organization decide)**. -6. Configure the access for your {% data variables.product.prodname_copilot %} subscription. - - To enable {% data variables.product.prodname_copilot %} for all organizations in your enterprise, both current and future, select **Enable for all organizations**. - - To enable {% data variables.product.prodname_copilot %} for specific organizations, select **Enable for specific organizations**. -7. If you selected **Enable for specific organizations**, select the organizations you want to enable {% data variables.product.prodname_copilot %} for. Alternatively, you can select the organizations you want to disable {% data variables.product.prodname_copilot %} access for. - - Click **Set organization permissions** and select **Enable** or **Disable** to grant or deny {% data variables.product.prodname_copilot %} access for the specified organizations. -8. To finish setting up your {% data variables.product.prodname_copilot_for_business %} subscription, click **Save and finish**. Organization administrators will receive an email with instructions on how to add members to {% data variables.product.prodname_copilot %}. \ No newline at end of file diff --git a/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md b/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md index aa68b51f58..135951db1a 100644 --- a/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md +++ b/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md @@ -1 +1 @@ -If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for any {% data variables.product.prodname_github_codespaces %} usage, and for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage beyond the amounts included with your account. +If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure subscription ID to your enterprise account to enable and pay for any {% data variables.product.prodname_github_codespaces %} usage, for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage beyond the amounts included with your account, and {% data variables.product.prodname_copilot_business_short %}.