Skip to content

Commit b68b52a

Browse files
Merge branch 'main' into awesome_copilot_instructions_link_correction
2 parents cb91f82 + dab2af5 commit b68b52a

File tree

111 files changed

+1433
-974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1433
-974
lines changed
70.8 KB
Loading
540 KB
Loading
-105 KB
Binary file not shown.

content/actions/reference/workflows-and-actions/expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ env:
5959
| `==` | Equal |
6060
| `!=` | Not equal |
6161
| `&&` | And |
62-
| <code>\|\|</code> | Or |
62+
| <code>\|\|</code> | Or |
6363

6464
> [!NOTE]
6565
> * {% data variables.product.company_short %} ignores case when comparing strings.

content/admin/data-residency/feature-overview-for-github-enterprise-cloud-with-data-residency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The following features are currently unavailable on {% data variables.enterprise
2424
| {% data variables.product.prodname_copilot_short %} Metrics API | Currently unavailable | [AUTOTITLE](/rest/copilot/copilot-metrics) |
2525
| {% data variables.product.prodname_github_codespaces %} | Currently unavailable. | [AUTOTITLE](/codespaces/quickstart) |
2626
| {% data variables.product.prodname_importer %} (the "Import repository" button on {% data variables.product.prodname_dotcom_the_website %}) | Instead, the **{% data variables.product.prodname_importer_proper_name %}** is available to migrate data. See [AUTOTITLE](/migrations/using-github-enterprise-importer/understanding-github-enterprise-importer/about-github-enterprise-importer). | [AUTOTITLE](/migrations/importing-source-code/using-github-importer/about-github-importer) |
27-
| {% data variables.product.prodname_marketplace %} | Currently, apps from {% data variables.product.prodname_marketplace %} are unavailable. {% data variables.product.prodname_actions %} workflows from {% data variables.product.prodname_marketplace %} may not function as expected. For more information, see [{% data variables.product.prodname_actions %} workflows from {% data variables.product.prodname_marketplace %}](#github-actions-workflows-from-github-marketplace). | [AUTOTITLE](/search-github/searching-on-github/searching-github-marketplace) | [AUTOTITLE](/enterprise-server@latest/admin/configuration/configuring-github-connect/about-github-connect#github-connect-features) in the {% data variables.product.prodname_ghe_server %} documentation |
27+
| {% data variables.product.prodname_marketplace %} | Currently, apps from {% data variables.product.prodname_marketplace %} are unavailable. {% data variables.product.prodname_actions %} workflows from {% data variables.product.prodname_marketplace %} may not function as expected. For more information, see [{% data variables.product.prodname_actions %} workflows from {% data variables.product.prodname_marketplace %}](#github-actions-workflows-from-github-marketplace). | [AUTOTITLE](/search-github/searching-on-github/searching-github-marketplace)<br>[AUTOTITLE](/enterprise-server@latest/admin/configuration/configuring-github-connect/about-github-connect#github-connect-features) in the {% data variables.product.prodname_ghe_server %} documentation |
2828
| {% data variables.product.prodname_github_models %} | Currently unavailable | [AUTOTITLE](/github-models/about-github-models) |
2929
| macOS runners for {% data variables.product.prodname_actions %} | Currently unavailable. | [AUTOTITLE](/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners) |
3030
| Maven and Gradle support for {% data variables.product.prodname_registry %} | Currently unavailable. | [AUTOTITLE](/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry) |

content/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The following IdPs are partner IdPs. They offer an application that you can use
4141

4242
* Microsoft Entra ID
4343
* Okta
44-
* PingFederate (beta)
44+
* PingFederate ({% data variables.release-phases.public_preview %})
4545

4646
When you use a single partner IdP for both authentication and provisioning, {% data variables.product.company_short %} provides support for the application on the partner IdP and the IdP's integration with {% data variables.product.prodname_dotcom %}. Support for PingFederate is in {% data variables.release-phases.public_preview %}.
4747

content/apps/creating-github-apps/writing-code-for-a-github-app/building-a-github-app-that-responds-to-webhook-events.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ const localWebhookUrl = `http://${host}:${port}${path}`;
221221
//
222222
// Octokit's `createNodeMiddleware` function takes care of generating this middleware function for you. The resulting middleware function will:
223223
//
224-
// - Check the signature of the incoming webhook event to make sure that it matches your webhook secret. This verifies that the incoming webhook event is a valid {% data variables.product.company_short %} event.
225-
// - Parse the webhook event payload and identify the type of event.
226-
// - Trigger the corresponding webhook event handler.
224+
// - Check the signature of the incoming webhook event to make sure that it matches your webhook secret. This verifies that the incoming webhook event is a valid {% data variables.product.company_short %} event.
225+
// - Parse the webhook event payload and identify the type of event.
226+
// - Trigger the corresponding webhook event handler.
227227
const middleware = createNodeMiddleware(app.webhooks, {path});
228228

229229
// This creates a Node.js server that listens for incoming HTTP requests (including webhook payloads from {% data variables.product.company_short %}) on the specified port. When the server receives a request, it executes the `middleware` function that you defined earlier. Once the server is running, it logs messages to the console to indicate that it is listening.

content/billing/concepts/cost-centers.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ contentType: concepts
1212
product: '{% data variables.product.prodname_ghe_cloud %}'
1313
---
1414

15-
You can create cost centers to attribute usage and spending to business units, improving accountability, forecasting, and cost allocation.
15+
Cost centers allow you to attribute usage and spending to business units, improving accountability, forecasting, and cost allocation. You can also apply one or more budgets to them to control costs.
1616

17-
If your account is billed through Azure, you can add an Azure subscription to a cost center to bill usage to a different Azure subscription than the enterprise default.
17+
## Cost center creation
18+
19+
* **Enterprise owners and billing managers** can create and edit cost centers for **any resource**.
20+
* **Organization owners** can create and edit cost centers that contain **resources in their organization**.
21+
22+
When you create a cost center, you define which resources it contains from users, repositories, and organizations. If your account is billed through Azure, you can also add an Azure subscription to bill usage to a different Azure subscription than the enterprise default.
1823

1924
To get started with cost centers, see [AUTOTITLE](/billing/tutorials/use-cost-centers).
2025

content/billing/reference/cost-center-allocation.md

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,39 @@ This article contains reference information for how spending is assigned to cost
2424
| ------- | ----------------------------------------------------- |
2525
| {% data variables.product.prodname_actions %} | The repository or organization where the workflow runs. |
2626
| {% data variables.product.prodname_github_codespaces %} | The repository or organization where the codespace is created. |
27-
| {% data variables.product.prodname_copilot %} | The user who receives the license (priority), or the organization that is billed for the {% data variables.product.prodname_copilot_short %} license. |
28-
| Git Large File Storage | The repository or organization where Git LFS is used. |
29-
| {% data variables.product.prodname_GH_cs_and_sp %} | The user who receives the license. |
27+
| {% data variables.product.prodname_copilot %} license | The user who receives the license (priority), or the organization that is billed for the {% data variables.product.prodname_copilot_short %} license. |
3028
| {% data variables.product.prodname_enterprise %} | The user who receives the license (priority), or the organization that is billed for the license. |
29+
| Git Large File Storage | The repository or organization where Git LFS is used. |
3130
| {% data variables.product.prodname_registry %} | The repository or organization that owns the package. |
31+
| {% data variables.product.prodname_prus_caps %} | The user who triggered the use of the {% data variables.product.prodname_pru %} (priority), or the organization they belong to. |
32+
| {% data variables.product.prodname_GH_cs_and_sp %} | A user who uses a license. |
3233

3334
## Details for license-based products
3435

35-
To ensure your cost centers reflect spending as intended, it's important to understand how spending is allocated to cost centers for license-based products like {% data variables.product.prodname_copilot %}, and how changes are reflected in your bill.
36+
To ensure your cost centers reflect spending as intended, it's important to understand how the cost of licenses is allocated to cost centers, and how changes are reflected in your bill.
3637

37-
### {% data variables.product.prodname_copilot %}
38+
### {% data variables.product.prodname_GH_cs_and_sp %}
3839

39-
* If a user belongs to a cost center, all usage associated with the user is charged to the cost center.
40-
* If a user does not belong to any cost center but the organization that is billed for the {% data variables.product.prodname_copilot_short %} license does, all usage associated with the user is charged to that cost center.
41-
* If the user receives access to {% data variables.product.prodname_copilot_short %} through **multiple organizations**, only one of the organizations is billed, and any cost center containing that organization is charged accordingly. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-subscription-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise#about-seat-assignment-for-copilot-in-your-enterprise).
40+
| User associated with a cost center | License usage charged |
41+
|--|--|
42+
| Direct assignment | To the cost center the user is assigned to |
43+
| By organization membership only | To the enterprise |
4244

43-
### {% data variables.product.prodname_GH_cs_and_sp %}
45+
### {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_copilot %}
4446

45-
* If a user belongs to a cost center, licenses consumed by the user are charged to the cost center.
46-
* If a user does not belong to any cost center, licenses consumed by the user are charged to the enterprise.
47+
Cost center allocation is slightly different for {% data variables.product.prodname_enterprise %} licenses and {% data variables.product.prodname_copilot %} licenses and usage.
4748

48-
### {% data variables.product.prodname_enterprise %}
49+
| User associated with a cost center | {% data variables.product.prodname_copilot_short %} license granted | License and product costs charged |
50+
|--|--|--|
51+
| Direct assignment | By any organization | To the cost center the user is assigned to |
52+
| By organization membership only | By an organization assigned to a cost center | To the **cost center** the organization belongs to. If the organization does not belong to a cost center, to the **enterprise** |
4953

50-
* If a user belongs to a cost center, the license consumed by the user is charged to the cost center.
51-
* If a user does not belong to any cost center, the license consumed by the user is charged to the enterprise.
54+
Users who belong to multiple organizations in an enterprise or who receive a {% data variables.product.prodname_copilot_short %} license from multiple organizations:
55+
56+
* **{% data variables.product.prodname_enterprise %}** license usage is allocated to the oldest organization and charges are allocated to the cost center containing that organization.
57+
* **{% data variables.product.prodname_copilot_short %}** license and product usage is allocated to one of the organizations and charges are allocated to the cost center containing that organization.
58+
59+
See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-subscription-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise#about-seat-assignment-for-copilot-in-your-enterprise).
5260

5361
## Understanding cost center usage and attribution
5462

@@ -86,6 +94,8 @@ The following example illustrates how usage is assigned to cost centers for lice
8694

8795
### The users
8896

97+
![Diagram illustrating the description of four users and their organization membership.](/assets/images/help/billing/cost-center-example-1.png)
98+
8999
There are four users, each a member of one or more organizations in the enterprise.
90100

91101
| User | Organization membership |
@@ -114,12 +124,14 @@ There are two cost centers in the enterprise, each with different users or organ
114124

115125
The following table illustrates how spending for each user is allocated to a cost center based on their membership of an organization or cost center. Any usage not assigned to a cost center is categorized as "Enterprise Only" spending.
116126

127+
![Diagram illustrating the assignment of users and organizations to cost centers, with the allocation of costs for the four users.](/assets/images/help/billing/cost-center-example-2.png)
128+
117129
{% rowheaders %}
118130

119131
| | Copilot charges | GHSP charges | GHE charges | Explanation |
120132
| ----------- | --------------- | ------------ | ----------- | ----------- |
121133
| Cost Center A | `user-1`, `user-3` | `user-1`, `user-3` | `user-1`, `user-3` | These users are assigned directly to the cost center. |
122-
| Cost Center B | `user-2`, `user-4` | {% octicon "dash" aria-label="Not applicable" %} | {% octicon "dash" aria-label="Not applicable" %} | These users aren't directly assigned to a cost center, so Copilot charges are assigned based on organization membership, whereas GHSP and GHE default to enterprise spending. |
123-
| Enterprise Only (default) | {% octicon "dash" aria-label="Not applicable" %} | `user-2`, `user-4` | `user-2`, `user-4` | These users aren't directly assigned to a cost center, so GHSP and GHE default to enterprise spending. |
134+
| Cost Center B | `user-2`, `user-4` | {% octicon "dash" aria-label="Not applicable" %} | `user-2`, `user-4` | These users aren't directly assigned to a cost center, so Copilot and GHE charges are assigned based on organization membership, whereas GHSP defaults to enterprise spending. |
135+
| Enterprise Only (default) | {% octicon "dash" aria-label="Not applicable" %} | `user-2`, `user-4` | {% octicon "dash" aria-label="Not applicable" %} | These users aren't directly assigned to a cost center, so GHSP defaults to enterprise spending. |
124136

125137
{% endrowheaders %}

content/billing/reference/index.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,26 @@ title: Reference for billing
33
shortTitle: Reference
44
intro: Find information to support your use of billing.
55
versions:
6-
fpt: "*"
7-
ghec: "*"
8-
ghes: "*"
6+
fpt: '*'
7+
ghec: '*'
8+
ghes: '*'
99
topics:
1010
- Billing
1111
children:
12-
- /product-usage-included
1312
- /actions-runner-pricing
14-
- /billing-reports
15-
- /supported-payment-methods
1613
- /azure-billing
1714
- /azure-subscription
15+
- /billing-reports
1816
- /billing-roles
1917
- /cost-center-allocation
20-
- /roles-for-visual-studio
21-
- /github-license-users
22-
- /license-reports
2318
- /costs-for-github-models
2419
- /enterprise-license-troubleshooting
20+
- /github-license-users
21+
- /license-reports
22+
- /product-and-sku-names
23+
- /product-usage-included
24+
- /roles-for-visual-studio
25+
- /supported-payment-methods
2526
contentType: reference
2627
---
28+

0 commit comments

Comments
 (0)