Skip to content

Commit 5abae2c

Browse files
Clarifies Copilot subscription for Customers under MSFT EA (github#35762)
Co-authored-by: hubwriter <[email protected]>
1 parent a579d66 commit 5abae2c

File tree

7 files changed

+58
-24
lines changed

7 files changed

+58
-24
lines changed

Diff for: content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md

+11
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,26 @@ You can set up a {% data variables.product.prodname_copilot_for_business %} subs
2525

2626
Before you can start using {% data variables.product.prodname_copilot_business_short %} in your enterprise, you will need to set up a subscription.
2727

28+
### Customers under a Microsoft Enterprise Agreement
29+
30+
{% data reusables.copilot.signup-procedure-enterprise-msft-ea %}
31+
32+
### Customers under a direct GitHub contract
33+
2834
{% data reusables.copilot.signup-procedure-enterprise %}
2935

3036
{% endif %}
37+
38+
{% ifversion fpt %}
39+
3140
## Setting up a {% data variables.product.prodname_copilot_business_short %} subscription for your organization
3241

3342
Before you can start using {% data variables.product.prodname_copilot %} in your organization account, you will need to set up a subscription.
3443

3544
{% data reusables.copilot.signup-procedure-org %}
3645

46+
{% endif %}
47+
3748
## Modifying your {% data variables.product.prodname_copilot_business_short %} subscription
3849

3950
{% ifversion ghec %}

Diff for: content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Connecting an Azure subscription to your enterprise
3-
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.'
3+
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 %}.'
44
redirect_from:
55
- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise
66
- /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
1111
---
1212
## About Azure subscriptions and {% data variables.product.product_name %}
1313

14-
{% 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)."
14+
{% 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)."
1515

1616
{% note %}
1717

18-
**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.
18+
**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.
1919

2020
{% endnote %}
2121

@@ -36,7 +36,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc
3636
1. Under "Payment Information", click **Add Azure Subscription**.
3737
1. To sign in to your Microsoft account, follow the prompts.
3838
1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**.
39-
1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your enterprise.
39+
1. Under "Select a subscription", select the Azure subscription ID that you want to connect to your enterprise.
4040

4141
{% note %}
4242

Diff for: content/copilot/quickstart.md

+30-8
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,42 @@ Before you can start using {% data variables.product.prodname_copilot %}, you wi
2929
**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 %}.
3030
{% endnote %}
3131

32-
## Signing up for {% data variables.product.prodname_copilot %} for your organization{% ifversion ghec %} or enterprise{% endif %} account
32+
{% ifversion fpt %}
3333

34-
{% ifversion ghec%}
35-
### Signing up for {% data variables.product.prodname_copilot %} for your enterprise account
34+
## Signing up for {% data variables.product.prodname_copilot %} for your organization account
3635

37-
{% data reusables.copilot.signup-procedure-enterprise %}
38-
39-
### Signing up for {% data variables.product.prodname_copilot %} for your organization account
40-
{% endif %}
4136

4237
Before you can start using {% data variables.product.prodname_copilot %} in your organization account, you will need to set up a subscription.
4338

4439
{% data reusables.copilot.signup-procedure-org %}
40+
{% endif %}
41+
42+
{% ifversion ghec %}
43+
44+
## Signing up for {% data variables.product.prodname_copilot %} for your enterprise account
45+
46+
{% note %}
47+
48+
**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.
49+
50+
{% endnote %}
51+
52+
### Customers under a Microsoft Enterprise Agreement
53+
54+
{% data reusables.copilot.signup-procedure-enterprise-msft-ea %}
55+
56+
### Customers under a direct GitHub contract
57+
58+
{% data reusables.copilot.signup-procedure-enterprise %}
59+
60+
## Enabling {% data variables.product.prodname_copilot %} for your enterprise account
61+
62+
{% data reusables.copilot.enabling-in-enterprise %}
63+
64+
For more information, see "[AUTOTITLE](/copilot/overview-of-github-copilot/enabling-and-setting-up-github-copilot-for-business)."
65+
66+
{% endif %}
67+
4568

4669
## Installing the {% data variables.product.prodname_copilot %} extension for {% data variables.product.prodname_vscode %}
4770

@@ -77,7 +100,6 @@ You successfully installed {% data variables.product.prodname_copilot %} and rec
77100
- [{% data variables.product.prodname_copilot %}](https://copilot.github.com/): See practical examples of how {% data variables.product.prodname_copilot %} can help you work.
78101
- [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.
79102

80-
81103
## Further reading
82104

83105
- [AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)

Diff for: data/reusables/copilot/enabling-in-enterprise.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{% data reusables.enterprise-accounts.policies-tab %}
2+
{% data reusables.enterprise-accounts.copilot-tab %}
3+
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.
4+
- To allow {% data variables.product.prodname_copilot %} suggestions matching public code, select **Allowed**.
5+
- To block {% data variables.product.prodname_copilot %} suggestions matching public code, select **Blocked**.
6+
- 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)**.
7+
1. Under "Manage organization access to {% data variables.product.prodname_copilot %}," configure the access for your {% data variables.product.prodname_copilot %} subscription.
8+
- To enable {% data variables.product.prodname_copilot %} for all organizations in your enterprise, both current and future, select **Allow for all organizations**.
9+
- To enable {% data variables.product.prodname_copilot %} for specific organizations, select **Allow for specific organizations**.
10+
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.
11+
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 %}.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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 for: data/reusables/copilot/signup-procedure-enterprise.md

-11
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,3 @@
44
4. Follow the steps to confirm your payment details, then click **Save**.
55

66
If you don't have a payment method on file, you'll be prompted to add one.
7-
8-
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.
9-
- To allow {% data variables.product.prodname_copilot %} suggestions matching public code, select **Allowed**.
10-
- To block {% data variables.product.prodname_copilot %} suggestions matching public code, select **Blocked**.
11-
- 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)**.
12-
6. Configure the access for your {% data variables.product.prodname_copilot %} subscription.
13-
- To enable {% data variables.product.prodname_copilot %} for all organizations in your enterprise, both current and future, select **Enable for all organizations**.
14-
- To enable {% data variables.product.prodname_copilot %} for specific organizations, select **Enable for specific organizations**.
15-
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.
16-
- Click **Set organization permissions** and select **Enable** or **Disable** to grant or deny {% data variables.product.prodname_copilot %} access for the specified organizations.
17-
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 %}.
Original file line numberDiff line numberDiff line change
@@ -1 +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.
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, 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 %}.

0 commit comments

Comments
 (0)