Skip to content

Commit 0ff3552

Browse files
authored
Merge pull request github#36644 from github/repo-sync
Repo sync
2 parents e46f454 + c93f423 commit 0ff3552

22 files changed

+26
-26
lines changed

data/reusables/actions/more-resources-for-ghes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
If you plan to enable {% data variables.product.prodname_actions %} or {% data variables.product.prodname_GH_advanced_security %} for the users of your instance, more resources are required.
1+
If you plan to enable {% data variables.product.prodname_actions %} or {% data variables.product.prodname_GH_code_security %} for the users of your instance, more resources are required.
22

33
* {% data variables.product.prodname_actions %} - increase both CPU and memory by at least 25%
4-
* {% data variables.product.prodname_GH_advanced_security %} - increase both CPU and memory by at least 25%
4+
* {% data variables.product.prodname_GH_code_security %} - increase both CPU and memory by at least 25%
55

66
These adjustments should be applied to the base requirements for each user tier. We recommend monitoring all changes to your resources, as further increases may be needed.
77

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
You can identify if your enterprise has a {% data variables.product.prodname_GH_advanced_security %} license by reviewing your enterprise settings. For more information, see [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise#checking-whether-your-license-includes-github-advanced-security).
1+
You can identify if your enterprise has a license for {% data variables.product.prodname_AS %} {% ifversion ghas-products-cloud %}products {% endif %}by reviewing your enterprise settings. For more information, see [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise#checking-whether-your-license-includes-github-advanced-security).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% data variables.product.prodname_GH_advanced_security %} helps developers improve and maintain the security and quality of code. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
1+
{% data variables.product.prodname_GHAS %} features help developers improve and maintain the security and quality of code. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom %}, you will need a {% data variables.product.prodname_GH_advanced_security %} license, available with {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}. {% data reusables.advanced-security.ghas-trial %}
1+
If you want to use {% data variables.product.prodname_GHAS %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom %}, you will need a license for {% data variables.product.prodname_GHAS %} features, available with {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %}, {% endif %}{% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}. {% data reusables.advanced-security.ghas-trial %}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% ifversion ghec %}If you pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss trialing {% data variables.product.prodname_GH_advanced_security %} for your enterprise.{% endif %}
1+
{% ifversion ghec %}If you pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss trialing {% data variables.product.prodname_GHAS %} features for your enterprise.{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{% ifversion ghec %}For information about how you can try {% data variables.product.prodname_GH_advanced_security %} for free, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security).
2-
{% elsif fpt %}For information about how you can try {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %} for free, see [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) and [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security#setting-up-your-trial-of-github-advanced-security) in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
1+
{% ifversion ghec %}For information about how you can try {% data variables.product.prodname_GHAS %} for free, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security).
2+
{% elsif fpt %}For information about how you can try {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GHAS %} for free, see [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) and [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security#setting-up-your-trial-of-github-advanced-security) in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% ifversion ghes or ghec %}
22

33
> [!NOTE]
4-
> If you enable {% data variables.product.prodname_GH_advanced_security %}, active committers to these repositories will use {% data variables.product.prodname_GH_advanced_security %} licenses. This option is deactivated if you have exceeded your license capacity. {% ifversion fpt or ghec %}See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).{% endif %}
4+
> If you enable {% data variables.product.prodname_GHAS %} features, active committers to these repositories will use {% data variables.product.prodname_GHAS_cs_or_sp %} licenses. This option is deactivated if you have exceeded your license capacity. {% ifversion fpt or ghec %}See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).{% endif %}
55
66
{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
1. Under "How many committers do you want to include?", enter the number of committers you want to purchase licenses for. For more information about committer numbers, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).
22

3-
You won't see this option if you're enrolled in usage-based billing for {% data variables.product.prodname_GH_advanced_security %} licenses.
3+
You won't see this option if you're enrolled in usage-based billing for {% data variables.product.prodname_GHAS_cs_or_sp %} licenses.
44
1. Confirm your billing information and payment method.
55
1. Click **Purchase Advanced Security**.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Some features are available for {% ifversion ghes %}all repositories{% elsif fpt or ghec %}repositories on all plans{% endif %}. Additional features are available to enterprises that use {% data variables.product.prodname_GH_advanced_security %}. {% ifversion fpt or ghec %}{% data variables.product.prodname_GH_advanced_security %} features are also enabled for all public repositories on {% data variables.product.prodname_dotcom %}.{% endif %} {% data reusables.advanced-security.more-info-ghas %}
1+
Some features are available for {% ifversion ghes %}all repositories{% elsif fpt or ghec %}repositories on all plans{% endif %}. Additional features are available to organizations and enterprises that use {% data variables.product.prodname_GHAS_cs_or_sp %}. {% ifversion fpt or ghec %}{% data variables.product.prodname_GHAS %} features are also enabled for all public repositories on {% data variables.product.prodname_dotcom %}.{% endif %} {% data reusables.advanced-security.more-info-ghas %}

data/reusables/audit_log/audit-log-action-categories.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| {% ifversion ghec or ghes %} |
1313
| `business` | Contains activities related to business settings for an enterprise. |
1414
| {% endif %} |
15-
| `business_advanced_security` | Contains activities related to {% data variables.product.prodname_GH_advanced_security %} in an enterprise. |
15+
| `business_advanced_security` | Contains activities related to {% data variables.product.prodname_AS %} in an enterprise. |
1616
| `business_secret_scanning` | Contains activities related to {% data variables.product.prodname_secret_scanning %} in an enterprise. |
1717
| `business_secret_scanning_automatic_validity_checks` | Contains activities related to enabling or disabling automatic validity checks for {% data variables.product.prodname_secret_scanning %} in an enterprise. |
1818
| {% ifversion secret-scanning-audit-log-custom-patterns %} |
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
> [!NOTE] There is a delay of up to 2 hours in the {% data variables.product.prodname_GH_advanced_security %} usage data on the "Overview" page after enabling the feature.
1+
> [!NOTE] There is a delay of up to 2 hours in the usage data for {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %} on the "Overview" page after enabling the feature.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If you started a free trial of {% data variables.product.prodname_GH_advanced_security %} during your {% data variables.product.prodname_ghe_cloud %} trial on or after August 1, 2024, your billing for {% data variables.product.prodname_GH_advanced_security %} will be usage-based. See, [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#metered-billing-for-github-advanced-security).
1+
If you started a free trial of {% data variables.product.prodname_GHAS %} during your {% data variables.product.prodname_ghe_cloud %} trial on or after August 1, 2024, your billing for {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %} will be usage-based. See, [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#metered-billing-for-github-advanced-security).
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## About the {% data variables.product.prodname_dotcom %} {% data variables.product.prodname_codeql %} license
22

3-
**License notice:** If you don’t have a license for {% data variables.product.prodname_GH_advanced_security %} then, by installing this product, you are agreeing to the [{% data variables.product.prodname_dotcom %} {% data variables.product.prodname_codeql %} Terms and Conditions](https://github.com/github/codeql-cli-binaries/blob/main/LICENSE.md).
3+
**License notice:** If you don’t have a license for {% data variables.product.prodname_GH_code_security %} then, by installing this product, you are agreeing to the [{% data variables.product.prodname_dotcom %} {% data variables.product.prodname_codeql %} Terms and Conditions](https://github.com/github/codeql-cli-binaries/blob/main/LICENSE.md).
44

55
{% data reusables.advanced-security.ghas-trial %}
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
> [!NOTE] {% ifversion fpt %}
2-
> * The {% data variables.product.prodname_codeql_cli %} is free to use on public repositories. The {% data variables.product.prodname_codeql_cli %} is also available in private repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GH_advanced_security %}. For information, see [{% data variables.product.github %} {% data variables.product.prodname_codeql %} Terms and Conditions](https://securitylab.github.com/tools/codeql/license) and [{% data variables.product.prodname_codeql %} CLI](https://codeql.github.com/docs/codeql-cli/).
2+
> * The {% data variables.product.prodname_codeql_cli %} is free to use on public repositories. The {% data variables.product.prodname_codeql_cli %} is also available in private repositories owned by organizations that use {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GH_code_security %}. For information, see [{% data variables.product.github %} {% data variables.product.prodname_codeql %} Terms and Conditions](https://securitylab.github.com/tools/codeql/license) and [{% data variables.product.prodname_codeql %} CLI](https://codeql.github.com/docs/codeql-cli/).
33
{%- elsif ghec %}
4-
> * The {% data variables.product.prodname_codeql_cli %} is free to use on public repositories that are maintained on {% data variables.product.prodname_dotcom_the_website %}, and available to use on private repositories that are owned by customers with an {% data variables.product.prodname_advanced_security %} license. For information, see [{% data variables.product.github %} {% data variables.product.prodname_codeql %} Terms and Conditions](https://securitylab.github.com/tools/codeql/license) and [{% data variables.product.prodname_codeql %} CLI](https://codeql.github.com/docs/codeql-cli/).
4+
> * The {% data variables.product.prodname_codeql_cli %} is free to use on public repositories that are maintained on {% data variables.product.prodname_dotcom_the_website %}, and available to use on private repositories that are owned by customers with an {% data variables.product.prodname_GH_code_security %} license. For information, see [{% data variables.product.github %} {% data variables.product.prodname_codeql %} Terms and Conditions](https://securitylab.github.com/tools/codeql/license) and [{% data variables.product.prodname_codeql %} CLI](https://codeql.github.com/docs/codeql-cli/).
55
{%- elsif ghes %}
6-
> * The {% data variables.product.prodname_codeql_cli %} is available to customers with an {% data variables.product.prodname_advanced_security %} license.{% endif %}
6+
> * The {% data variables.product.prodname_codeql_cli %} is available to customers with a {% data variables.product.prodname_GH_code_security %} license.{% endif %}
77
> * {% data reusables.code-scanning.non-glibc-linux-support %}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
> [!NOTE]
2-
> Uploading SARIF data to display as {% data variables.product.prodname_code_scanning %} results in {% data variables.product.github %} is supported for organization-owned repositories with {% data variables.product.prodname_GH_advanced_security %} enabled{% ifversion fpt or ghec %}, and public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository).
2+
> Uploading SARIF data to display as {% data variables.product.prodname_code_scanning %} results in {% data variables.product.github %} is supported for organization-owned repositories with {% data variables.product.prodname_GH_code_security %} enabled{% ifversion fpt or ghec %}, and public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
For a person using multiple {% data variables.product.prodname_enterprise %} environments to only consume a single license, you must synchronize license usage between environments. Then, {% data variables.product.company_short %} will deduplicate users based on the email addresses associated with their user accounts. {% data variables.product.company_short %} deduplicates licenses for the {% data variables.product.prodname_enterprise %} plan itself, {% ifversion ghas-in-license-sync %}and{% ifversion ghec %} if you use {% data variables.product.prodname_ghe_server %} version 3.12 or later,{% endif %} for {% data variables.product.prodname_GH_advanced_security %}{% else %}but not for other {% data variables.product.company_short %} products{% endif %}. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise#about-the-calculation-of-consumed-licenses).
1+
For a person using multiple {% data variables.product.prodname_enterprise %} environments to only consume a single license, you must synchronize license usage between environments. Then, {% data variables.product.company_short %} will deduplicate users based on the email addresses associated with their user accounts. {% data variables.product.company_short %} deduplicates licenses for the {% data variables.product.prodname_enterprise %} plan itself, and{% ifversion ghec %} if you use {% data variables.product.prodname_ghe_server %} version 3.12 or later,{% endif %} for {% data variables.product.prodname_GHAS %}{% ifversion ghas-products-cloud %} products{% endif %}. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise#about-the-calculation-of-consumed-licenses).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If you have a GitHub Advanced Security license for your enterprise account, you can enforce policies to manage {% data variables.product.prodname_GH_advanced_security %} features for organizations owned by an enterprise account. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise).
1+
If you have a {% data variables.product.prodname_GH_advanced_security %} license for your enterprise account, you can enforce policies to manage {% data variables.product.prodname_GH_advanced_security %} features for organizations owned by an enterprise account. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise).
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% ifversion secret-scanning-custom-pattern-ai-generated %}
22

33
> [!NOTE]
4-
> You do not need a subscription to {% data variables.product.prodname_copilot %} to use {% data variables.secret-scanning.copilot-secret-scanning %}'s {% data variables.secret-scanning.custom-pattern-regular-expression-generator %}. {% data variables.secret-scanning.copilot-secret-scanning %} features are available to private repositories in {% data variables.product.prodname_ghe_cloud %} enterprises with {% data variables.product.prodname_GH_advanced_security %} enabled.
4+
> You do not need a subscription to {% data variables.product.prodname_copilot %} to use {% data variables.secret-scanning.copilot-secret-scanning %}'s {% data variables.secret-scanning.custom-pattern-regular-expression-generator %}. {% data variables.secret-scanning.copilot-secret-scanning %} features are available to private repositories in organizations and enterprises with {% data variables.product.prodname_GH_secret_protection %} enabled.
55
66
{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% ifversion secret-scanning-ai-generic-secret-detection %}
22

33
> [!NOTE]
4-
> You do not need a subscription to {% data variables.product.prodname_copilot %} to use {% data variables.secret-scanning.copilot-secret-scanning %}'s {% data variables.secret-scanning.generic-secret-detection %}. {% data variables.secret-scanning.copilot-secret-scanning %} features are available to private repositories in {% data variables.product.prodname_ghe_cloud %} enterprises that have {% data variables.product.prodname_GH_advanced_security %} enabled.
4+
> You do not need a subscription to {% data variables.product.prodname_copilot %} to use {% data variables.secret-scanning.copilot-secret-scanning %}'s {% data variables.secret-scanning.generic-secret-detection %}. {% data variables.secret-scanning.copilot-secret-scanning %} features are available to private repositories in organizations and enterprises with {% data variables.product.prodname_GH_secret_protection %} enabled.
55
66
{% endif %}

0 commit comments

Comments
 (0)