Skip to content

Commit a50239a

Browse files
authored
Merge branch 'main' into oxidizegithub
2 parents d9727c4 + d25344a commit a50239a

File tree

313 files changed

+481
-3275
lines changed

Some content is hidden

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

313 files changed

+481
-3275
lines changed

content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you're new to SARIF and want to learn more, see Microsoft's [`SARIF tutorials
3535

3636
## Providing data to track {% data variables.product.prodname_code_scanning %} alerts across runs
3737

38-
Each time the results of a new code scan are uploaded, the results are processed and alerts are added to the repository. To prevent duplicate alerts for the same problem, {% data variables.product.prodname_code_scanning %} uses fingerprints to match results across various runs so they only appear once in the latest run for the selected branch. This makes it possible to match alerts to the correct line of code when files are edited. The `ruleID` for a result has to be the same across analysis.
38+
Each time the results of a new code scan are uploaded, the results are processed and alerts are added to the repository. To prevent duplicate alerts for the same problem, {% data variables.product.prodname_code_scanning %} uses fingerprints to match results across various runs so they only appear once in the latest run for the selected branch. This makes it possible to match alerts to the correct line of code when files are edited. The `ruleId` for a result has to be the same across analysis.
3939

4040
### Reporting consistent filepaths
4141

@@ -536,7 +536,7 @@ This SARIF output file has example values to show all supported SARIF properties
536536
{
537537
"ruleId": "R01",
538538
"message": {
539-
"text": "Specifying both [ruleIndex](1) and [ruleID](2) might lead to inconsistencies."
539+
"text": "Specifying both [ruleIndex](1) and [ruleId](2) might lead to inconsistencies."
540540
},
541541
"level": "error",
542542
"locations": [

content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ By default, {% data variables.product.prodname_copilot_chat_short %} uses the `G
8787

8888
By default, {% data variables.product.prodname_copilot_chat_short %} uses the `GPT 4o` model. If you grant access to the o1 family of models, members of your enterprise can select to use these models rather than the default `GPT 4o` model.
8989

90-
The o1 family of models includes two models:
90+
The o1 family of models includes three models:
9191

92-
* `o1-preview`: This model is focused on advanced reasoning and solving complex problems, in particular in math and science. It responds more slowly than the `gpt-4o` model. Each member of your enterprise can make 10 requests to this model per day.
93-
* `o1-mini`: This is the faster version of the `o1-preview` model, balancing the use of complex reasoning with the need for faster responses. It is best suited for code generation and small context operations. Each member of your enterprise can make 50 requests to this model per day.
92+
* `o1`/`o1-preview`: These models are focused on advanced reasoning and solving complex problems, in particular in math and science. They respond more slowly than the `gpt-4o` model. Each member of your enterprise can make 10 requests to each of these models per day.
93+
* `o1-mini`: This is the faster version of the `o1` model, balancing the use of complex reasoning with the need for faster responses. It is best suited for code generation and small context operations. Each member of your enterprise can make 50 requests to this model per day.
9494

9595
### {% data variables.product.prodname_copilot_short %} Metrics API access
9696

content/copilot/using-github-copilot/asking-github-copilot-questions-in-github.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The skills you can use in {% data variables.product.prodname_copilot_chat_dotcom
6767

6868
{% data reusables.copilot.copilot-chat-models-beta-note %}
6969

70-
{% data reusables.copilot.copilot-chat-models-list %}
70+
{% data reusables.copilot.copilot-chat-models-list-o1 %}
7171

7272
### Limitations of AI models for {% data variables.product.prodname_copilot_chat_short %}
7373

content/copilot/using-github-copilot/asking-github-copilot-questions-in-your-ide.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ You can tell {% data variables.product.prodname_copilot_short %} to answer a que
153153

154154
{% data reusables.copilot.copilot-chat-models-beta-note %}
155155

156-
{% data reusables.copilot.copilot-chat-models-list %}
156+
{% data reusables.copilot.copilot-chat-models-list-o1 %}
157157

158158
### Changing your AI model
159159

@@ -308,7 +308,7 @@ You can tell {% data variables.product.prodname_copilot_short %} to answer a que
308308

309309
{% data reusables.copilot.copilot-chat-models-beta-note %}
310310

311-
{% data reusables.copilot.copilot-chat-models-list %}
311+
{% data reusables.copilot.copilot-chat-models-list-o1-preview %}
312312

313313
### Changing your AI model
314314

content/copilot/using-github-copilot/getting-code-suggestions-in-your-ide-with-github-copilot.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ This guide demonstrates how to get coding suggestions from {% data variables.pro
445445
{% data variables.product.prodname_copilot %} offers coding suggestions as you type. For example, type this function
446446
signature in a Swift file:
447447

448-
```shell copy
449-
func CalculateDaysBetweenDates(
448+
```swift copy
449+
func calculateDaysBetweenDates(
450450
```
451451

452452
{% data variables.product.prodname_copilot %} will automatically suggest an entire function body in grayed text. To accept the first line of a suggestion, press <kbd>Tab</kbd>. To view the full suggestion, hold <kbd>Option</kbd>, and to accept the full suggestion, press <kbd>Option</kbd>+<kbd>Tab</kbd>.

data/code-languages.yml

+3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ shell:
6161
sql:
6262
name: SQL
6363
comment: hyphen
64+
swift:
65+
name: Swift
66+
comment: slash
6467
text:
6568
name: Text
6669
comment: number
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Each account on {% data variables.product.product_name %} is billed separately. Upgrading an organization account enables paid features for the organization's repositories only and does not affect the features available in repositories owned by any associated personal accounts. Similarly, upgrading a personal account enables paid features for the personal account's repositories only and does not affect the repositories of any organization accounts. For more information about account types, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
1+
Each account on {% data variables.product.product_name %} is billed separately. Upgrading an organization account enables paid features for the organization's repositories only and does not affect the features available in repositories owned by any associated personal accounts. Similarly, upgrading a personal account enables paid features for the personal account's repositories only and does not affect the repositories of any organization accounts. For more information about account types, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1. For each of your accounts, create a dedicated {% data variables.product.pat_v1 %} with `repo` scope. {% ifversion pat-v2 %}Or, for each of your accounts and for each organization that you are a member of, create a {% data variables.product.pat_v2 %} that can access the desired repositories and that has read and write permissions on repository contents.{% endif %} For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."
1+
1. For each of your accounts, create a dedicated {% data variables.product.pat_v1 %} with `repo` scope. {% ifversion pat-v2 %}Or, for each of your accounts and for each organization that you are a member of, create a {% data variables.product.pat_v2 %} that can access the desired repositories and that has read and write permissions on repository contents.{% endif %} For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If you protect your personal account with two-factor authentication but do not know your password, {% ifversion 2fa-recovery-flow %} you will need to start a two-factor authentication recovery request. For more information, see "[Request help with two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials#requesting-help-with-two-factor-authentication)."{% else %}you will not be able to follow these steps to recover your account.{% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)."{% endif %}
1+
If you protect your personal account with two-factor authentication but do not know your password, {% ifversion 2fa-recovery-flow %} you will need to start a two-factor authentication recovery request. For more information, see [Request help with two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials#requesting-help-with-two-factor-authentication).{% else %}you will not be able to follow these steps to recover your account.{% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password).{% endif %}

data/reusables/actions/about-artifact-attestations.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ When you generate artifact attestations with your software, you create cryptogra
44

55
* A link to the workflow associated with the artifact.
66
* The repository, organization, environment, commit SHA, and triggering event for the artifact.
7-
* Other information from the OIDC token used to establish provenance. For more information, see "[AUTOTITLE](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."
7+
* Other information from the OIDC token used to establish provenance. For more information, see [AUTOTITLE](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect).
88

99
You can also generate artifact attestations that include an associated software bill of materials (SBOM). Associating your builds with a list of the open source dependencies used in them provides transparency and enables consumers to comply with data protection standards.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
You can deliver deployments through {% data variables.product.prodname_actions %} and environments or with the REST API and third party apps. For more information about using environments to deploy with {% data variables.product.prodname_actions %}, see "[AUTOTITLE](/actions/deployment/targeting-different-environments/managing-environments-for-deployment)." For more information about deployments with the REST API, see "[AUTOTITLE](/rest/repos#deployments)."
1+
You can deliver deployments through {% data variables.product.prodname_actions %} and environments or with the REST API and third party apps. For more information about using environments to deploy with {% data variables.product.prodname_actions %}, see [AUTOTITLE](/actions/deployment/targeting-different-environments/managing-environments-for-deployment). For more information about deployments with the REST API, see [AUTOTITLE](/rest/repos#deployments).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Environments are used to describe a general deployment target like `production`, `staging`, or `development`. When a {% data variables.product.prodname_actions %} workflow deploys to an environment, the environment is displayed on the main page of the repository. You can use environments to require approval for a job to proceed, restrict which branches can trigger a workflow{% ifversion actions-custom-deployment-protection-rules-beta %}, gate deployments with custom deployment protection rules{% endif %}, or limit access to secrets. For more information about creating environments, see "[AUTOTITLE](/actions/deployment/targeting-different-environments/managing-environments-for-deployment)."
1+
Environments are used to describe a general deployment target like `production`, `staging`, or `development`. When a {% data variables.product.prodname_actions %} workflow deploys to an environment, the environment is displayed on the main page of the repository. You can use environments to require approval for a job to proceed, restrict which branches can trigger a workflow{% ifversion actions-custom-deployment-protection-rules-beta %}, gate deployments with custom deployment protection rules{% endif %}, or limit access to secrets. For more information about creating environments, see [AUTOTITLE](/actions/deployment/targeting-different-environments/managing-environments-for-deployment).
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
If your {% data variables.product.prodname_actions %} workflows need to access resources from a cloud provider that supports OpenID Connect (OIDC), you can configure your workflows to authenticate directly to the cloud provider. This will let you stop storing these credentials as long-lived secrets and provide other security benefits. For more information, see "[AUTOTITLE](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)"
2+
If your {% data variables.product.prodname_actions %} workflows need to access resources from a cloud provider that supports OpenID Connect (OIDC), you can configure your workflows to authenticate directly to the cloud provider. This will let you stop storing these credentials as long-lived secrets and provide other security benefits. For more information, see [AUTOTITLE](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)

data/reusables/actions/about-runner-groups.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ To control access to runners at the organization{% ifversion ghec or ghes %} and
22

33
When you grant access to a runner group, you can see the runner group listed in the organization's runner settings. Optionally, you can assign additional granular repository{% ifversion restrict-groups-to-workflows %} and workflow{% endif %} access policies to the runner group.
44

5-
When new runners are created, they are automatically assigned to the default group unless otherwise specified. Runners can only be in one group at a time. You can move runners from one runner group to another. For more information, see "[Moving a runner to a group](#moving-a-runner-to-a-group)."
5+
When new runners are created, they are automatically assigned to the default group unless otherwise specified. Runners can only be in one group at a time. You can move runners from one runner group to another. For more information, see [Moving a runner to a group](#moving-a-runner-to-a-group).
66

77
{% ifversion target-runner-groups %}
8-
For information on how to route jobs to runners in a specific group, see "[AUTOTITLE](/actions/using-jobs/choosing-the-runner-for-a-job#choosing-runners-in-a-group)."
8+
For information on how to route jobs to runners in a specific group, see [AUTOTITLE](/actions/using-jobs/choosing-the-runner-for-a-job#choosing-runners-in-a-group).
99
{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% data variables.product.prodname_dotcom %} provides security features that you can use to increase the security of your workflows. You can use {% data variables.product.prodname_dotcom %}'s built-in features to ensure you are notified about vulnerabilities in the actions you consume, or to automate the process of keeping the actions in your workflows up to date. For more information, see "[AUTOTITLE](/actions/security-guides/using-githubs-security-features-to-secure-your-use-of-github-actions)."
1+
{% data variables.product.prodname_dotcom %} provides security features that you can use to increase the security of your workflows. You can use {% data variables.product.prodname_dotcom %}'s built-in features to ensure you are notified about vulnerabilities in the actions you consume, or to automate the process of keeping the actions in your workflows up to date. For more information, see [AUTOTITLE](/actions/security-guides/using-githubs-security-features-to-secure-your-use-of-github-actions).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
For more information about the action, and for instructions about how to download the most recent version, see "[AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/using-the-latest-version-of-the-official-bundled-actions)."
1+
For more information about the action, and for instructions about how to download the most recent version, see [AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/using-the-latest-version-of-the-official-bundled-actions).

data/reusables/actions/actions-activity-types.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ on:
1919
- labeled
2020
```
2121
22-
For more information about each event and their activity types, see "[AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows)."
22+
For more information about each event and their activity types, see [AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows).
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% data variables.product.prodname_actions_runner_controller %} (ARC) is a Kubernetes operator that orchestrates and scales self-hosted runners for {% data variables.product.prodname_actions %}. For more information, see [Operator pattern](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/) in the Kubernetes documentation.
22

3-
With ARC, you can create runner scale sets that automatically scale based on the number of workflows running in your repository, organization, or enterprise. Because controlled runners can be ephemeral and based on containers, new runner instances can scale up or down rapidly and cleanly. For more information about autoscaling, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/autoscaling-with-self-hosted-runners)."
3+
With ARC, you can create runner scale sets that automatically scale based on the number of workflows running in your repository, organization, or enterprise. Because controlled runners can be ephemeral and based on containers, new runner instances can scale up or down rapidly and cleanly. For more information about autoscaling, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/autoscaling-with-self-hosted-runners).

data/reusables/actions/actions-secrets-variables-repository-access.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% ifversion fpt %}
33

44
> [!NOTE]
5-
> Organization-level secrets and variables are not accessible by private repositories for {% data variables.product.prodname_free_user %}. For more information about upgrading your {% data variables.product.company_short %} subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)".
5+
> Organization-level secrets and variables are not accessible by private repositories for {% data variables.product.prodname_free_user %}. For more information about upgrading your {% data variables.product.company_short %} subscription, see [AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription).
66
77
{% endif %}
88

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
> [!NOTE]
22
> Enterprise and organization owners{% ifversion custom-org-roles %} and users with the "Manage organization runners and runner groups" permission{% endif %} can create runners from this page. To create a new runner, click **New runner** at the top right of the list of runners to add runners to the repository.
33
>
4-
> For more information, see {% ifversion actions-hosted-runners %}"[AUTOTITLE](/actions/using-github-hosted-runners/managing-larger-runners)" and {% endif %}"[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."
4+
> For more information, see {% ifversion actions-hosted-runners %}[AUTOTITLE](/actions/using-github-hosted-runners/managing-larger-runners) and {% endif %}[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners).
55
{% ifversion custom-org-roles %}
6-
>For more information about custom organization roles, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles)."
6+
>For more information about custom organization roles, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles).
77
{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% data variables.product.prodname_actions %} usage metrics do not apply minute multipliers to the metrics displayed. While they _can_ help you understand your bill, their primary purpose is to help you understand how and where Actions minutes are being used in your organization.
22

3-
For more information about minute multipliers, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#minute-multipliers)."
3+
For more information about minute multipliers, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#minute-multipliers).

0 commit comments

Comments
 (0)