Skip to content

Commit 4c37a8a

Browse files
authored
Merge pull request #40107 from github/repo-sync
Repo sync
2 parents 6205b58 + 1339f68 commit 4c37a8a

File tree

14 files changed

+236
-232
lines changed

14 files changed

+236
-232
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To ensure your cost centers reflect spending as intended, it's important to unde
3737
### {% data variables.product.prodname_copilot %}
3838

3939
* 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, if the organization that provides the user their {% data variables.product.prodname_copilot_short %} license 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.
4141
* 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).
4242

4343
### {% data variables.product.prodname_GH_cs_and_sp %}

content/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ When creating a secret in an organization, you can use a policy to limit which r
119119

120120
You can add {% data variables.product.prodname_dependabot %}-related IP addresses to your registries IP allow list.
121121

122-
If your private registry is configured with an IP allow list, you can find the IP addresses {% data variables.product.prodname_dependabot %} uses to access the registry in the meta API endpoint, under the `dependabot` key. If you run {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_actions %} self-hosted runners, you should instead use the IP addresses under the `actions` key. For more information, see [AUTOTITLE](/rest/meta/meta) and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners).
122+
If your private registry is configured with an IP allow list, you can find the IP addresses {% data variables.product.prodname_dependabot %} uses to access the registry in the meta API endpoint, under the `actions` key. For more information, see [AUTOTITLE](/rest/meta/meta) and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners).
123123

124124
{% endif %}
125125

content/copilot/reference/copilot-billing/license-changes.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ What you need to know about the following actions:
4040
* Billing for that user stops at the end of the cycle.
4141
* Reduced seat count takes effect at the start of the **next billing cycle**.
4242
* **No refunds are issued for unused time in the current cycle.**
43-
* **Access:** If a seat is unassigned during a billing cycle, the affected user can still access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
43+
* **Access:**
44+
* If a seat is unassigned during a billing cycle, the affected user can still access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
45+
* If a seat is revoked, users lose access **immediately.**
4446

4547
Additionally:
4648

@@ -58,9 +60,12 @@ What you need to know about the following actions:
5860
### Removing seats
5961

6062
* **Billing:**
61-
* The reduced seat count is effective in the **next billing cycle**.
62-
* **There are no refunds for the current cycle.**
63-
* **Access:** Users lose access **immediately** if their seat is removed, but seats can be reassigned within the current cycle until the new count applies.
63+
* Billing for that user stops at the end of the cycle.
64+
* Reduced seat count takes effect at the start of the **next billing cycle.**
65+
* **No refunds are issued for unused time in the current cycle.**
66+
* **Access:**
67+
* If a seat is unassigned during a billing cycle, the affected user can still access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
68+
* If a seat is revoked, users lose access **immediately.**
6469

6570
Additionally:
6671

@@ -72,8 +77,7 @@ Additionally:
7277

7378
* **Proration:** Applies when adding seats/licenses or upgrading plans. You pay only for the portion of the billing cycle remaining.
7479
* **Access:** Assignments and plan changes are effective immediately for affected users.
75-
* **Removing or canceling:** No refunds are issued for unused time; access continues until the end of the cycle paid for, unless a seat/license is unassigned.
76-
* **Reassignment:** In {% data variables.copilot.copilot_for_business %} and {% data variables.copilot.copilot_enterprise %} plans, unassigned seats/licenses can be immediately reassigned to another user during the current billing cycle.
80+
* **Removing or canceling:** No refunds are issued for unused time; access continues until the end of the cycle paid for, unless a seat/license is revoked.
7781

7882
| Scenario | Plan | When is billing affected? | Is proration applied? | When does access change? | Refund for unused time? |
7983
|----------------------------------|---------------------|--------------------------|----------------------|--------------------------|-------------------------|

src/audit-logs/data/ghec/enterprise.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
},
161161
{
162162
"action": "api.request",
163-
"description": "An API request was made to a security relevant endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
163+
"description": "An API request was made to an endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
164164
"docs_reference_links": "/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise#enabling-audit-log-streaming-of-api-requests",
165165
"fields": [
166166
"user_agent",
@@ -20170,4 +20170,4 @@
2017020170
"request_access_security_header"
2017120171
]
2017220172
}
20173-
]
20173+
]

src/audit-logs/data/ghes-3.14/enterprise.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
},
127127
{
128128
"action": "api.request",
129-
"description": "An API request was made to a security relevant endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
129+
"description": "An API request was made to an endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
130130
"docs_reference_links": "/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise#enabling-audit-log-streaming-of-api-requests",
131131
"fields": [
132132
"user_agent",
@@ -16247,4 +16247,4 @@
1624716247
"request_access_security_header"
1624816248
]
1624916249
}
16250-
]
16250+
]

src/audit-logs/data/ghes-3.15/enterprise.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
},
127127
{
128128
"action": "api.request",
129-
"description": "An API request was made to a security relevant endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
129+
"description": "An API request was made to an endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
130130
"docs_reference_links": "/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise#enabling-audit-log-streaming-of-api-requests",
131131
"fields": [
132132
"user_agent",
@@ -16446,4 +16446,4 @@
1644616446
"request_access_security_header"
1644716447
]
1644816448
}
16449-
]
16449+
]

src/audit-logs/data/ghes-3.16/enterprise.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
},
127127
{
128128
"action": "api.request",
129-
"description": "An API request was made to a security relevant endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
129+
"description": "An API request was made to an endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
130130
"docs_reference_links": "/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise#enabling-audit-log-streaming-of-api-requests",
131131
"fields": [
132132
"user_agent",
@@ -17160,4 +17160,4 @@
1716017160
"request_access_security_header"
1716117161
]
1716217162
}
17163-
]
17163+
]

src/audit-logs/data/ghes-3.17/enterprise.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
},
127127
{
128128
"action": "api.request",
129-
"description": "An API request was made to a security relevant endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
129+
"description": "An API request was made to an endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
130130
"docs_reference_links": "/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise#enabling-audit-log-streaming-of-api-requests",
131131
"fields": [
132132
"user_agent",
@@ -17607,4 +17607,4 @@
1760717607
"request_access_security_header"
1760817608
]
1760917609
}
17610-
]
17610+
]

src/audit-logs/data/ghes-3.18/enterprise.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
},
127127
{
128128
"action": "api.request",
129-
"description": "An API request was made to a security relevant endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
129+
"description": "An API request was made to an endpoint for the enterprise, or an enterprise owned resource. This event is only included if API Request Events is enabled in the enterprise's audit log settings. This event is only available via audit log streaming.",
130130
"docs_reference_links": "/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise#enabling-audit-log-streaming-of-api-requests",
131131
"fields": [
132132
"user_agent",
@@ -17710,4 +17710,4 @@
1771017710
"request_access_security_header"
1771117711
]
1771217712
}
17713-
]
17713+
]

src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"git": "Note: Git events have special access requirements and retention policies that differ from other audit log events. For GitHub Enterprise Cloud, access Git events via the REST API only with 7-day retention. For GitHub Enterprise Server, Git events must be enabled in audit log configuration and are not included in search results.",
1010
"sso_redirect": "Note: Automatically redirecting users to sign in is currently in beta for Enterprise Managed Users and subject to change."
1111
},
12-
"sha": "19cd54f06382e76031a46d1d8373c57fb98181db"
12+
"sha": "702197225c7719a9451017b7efcf672693a020e0"
1313
}

0 commit comments

Comments
 (0)