Merge branch 'main' into oxidizegithub

Author: foursixnine

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

@@ -35,7 +35,7 @@ If you're new to SARIF and want to learn more, see Microsoft's [`SARIF tutorials
 
 ## Providing data to track {% data variables.product.prodname_code_scanning %} alerts across runs
 
-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.
+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.
 
 ### Reporting consistent filepaths
 
@@ -536,7 +536,7 @@ This SARIF output file has example values to show all supported SARIF properties
         {
           "ruleId": "R01",
           "message": {
-            "text": "Specifying both [ruleIndex](1) and [ruleID](2) might lead to inconsistencies."
+            "text": "Specifying both [ruleIndex](1) and [ruleId](2) might lead to inconsistencies."
           },
           "level": "error",
           "locations": [

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

@@ -87,10 +87,10 @@ By default, {% data variables.product.prodname_copilot_chat_short %} uses the `G
 
 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.
 
-The o1 family of models includes two models:
+The o1 family of models includes three models:
 
-* `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.
-* `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.
+* `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.
+* `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.
 
 ### {% data variables.product.prodname_copilot_short %} Metrics API access
 

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

@@ -67,7 +67,7 @@ The skills you can use in {% data variables.product.prodname_copilot_chat_dotcom
 
 {% data reusables.copilot.copilot-chat-models-beta-note %}
 
-{% data reusables.copilot.copilot-chat-models-list %}
+{% data reusables.copilot.copilot-chat-models-list-o1 %}
 
 ### Limitations of AI models for {% data variables.product.prodname_copilot_chat_short %}
 

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

@@ -153,7 +153,7 @@ You can tell {% data variables.product.prodname_copilot_short %} to answer a que
 
 {% data reusables.copilot.copilot-chat-models-beta-note %}
 
-{% data reusables.copilot.copilot-chat-models-list %}
+{% data reusables.copilot.copilot-chat-models-list-o1 %}
 
 ### Changing your AI model
 
@@ -308,7 +308,7 @@ You can tell {% data variables.product.prodname_copilot_short %} to answer a que
 
 {% data reusables.copilot.copilot-chat-models-beta-note %}
 
-{% data reusables.copilot.copilot-chat-models-list %}
+{% data reusables.copilot.copilot-chat-models-list-o1-preview %}
 
 ### Changing your AI model
 

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

@@ -445,8 +445,8 @@ This guide demonstrates how to get coding suggestions from {% data variables.pro
 {% data variables.product.prodname_copilot %} offers coding suggestions as you type. For example, type this function
 signature in a Swift file:
 
-```shell copy
-func CalculateDaysBetweenDates(
+```swift copy
+func calculateDaysBetweenDates(
 ```
 
 {% 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

@@ -61,6 +61,9 @@ shell:
 sql:
   name: SQL
   comment: hyphen
+swift:
+  name: Swift
+  comment: slash
 text:
   name: Text
   comment: number

data/reusables/accounts/accounts-billed-separately.md

@@ -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)."
+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).

data/reusables/accounts/create-personal-access-tokens.md

@@ -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. 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).

data/reusables/accounts/you-must-know-your-password.md

@@ -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 %}
+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

@@ -4,6 +4,6 @@ When you generate artifact attestations with your software, you create cryptogra
 
 * A link to the workflow associated with the artifact.
 * The repository, organization, environment, commit SHA, and triggering event for the artifact.
-* 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)."
+* 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).
 
 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.