Skip to content

Commit 93164b1

Browse files
authored
Merge pull request #39903 from github/repo-sync
Repo sync
2 parents 0078206 + cafe8d0 commit 93164b1

33 files changed

+320
-402
lines changed

content/admin/managing-code-security/securing-your-enterprise/about-security-configurations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ topics:
1818

1919
{% ifversion ghec %}
2020

21-
When you create a security configuration with {% data variables.product.prodname_AS %} features enabled, your enterprise will incur usage costs when you apply the configuration to repositories if your enterprise account has metered billing. If you have bought volume/subscription licenses for {% data variables.product.prodname_GHAS %}, {% data variables.product.prodname_GH_code_security %}, or {% data variables.product.prodname_GH_secret_protection %}, you will need enough licenses to cover any additional unique committers.
21+
When you create a security configuration with {% data variables.product.prodname_AS %} features enabled, your enterprise will incur usage costs when you apply the configuration to repositories if your enterprise account has metered billing. If you have bought volume/subscription licenses for {% data variables.product.prodname_GHAS %}, {% data variables.product.prodname_GH_code_security %}, or {% data variables.product.prodname_GH_secret_protection %}, you will need enough licenses to cover any additional unique committers. See [AUTOTITLE](/billing/how-tos/products/add-advanced-security).
2222

2323
{% endif %}
2424

content/billing/concepts/product-billing/git-lfs.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,24 @@ redirect_from:
1111
- /github/managing-large-files/about-storage-and-bandwidth-usage
1212
- /github/managing-large-files/versioning-large-files/about-storage-and-bandwidth-usage
1313
- /repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage
14+
# Redirects from upgrading Git LFS storage
15+
- /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-git-large-file-storage
16+
- /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account
17+
- /articles/purchasing-additional-storage-and-bandwidth-for-an-organization
18+
- /articles/upgrading-git-large-file-storage
19+
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
20+
- /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
21+
- /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
22+
- /billing/how-tos/products/upgrade-git-lfs-storage
23+
# Redirects from downgrading Git LFS storage
24+
- /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage
25+
- /articles/downgrading-storage-and-bandwidth-for-a-personal-account
26+
- /articles/downgrading-storage-and-bandwidth-for-an-organization
27+
- /articles/downgrading-git-large-file-storage
28+
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
29+
- /billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
30+
- /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
31+
- /billing/how-tos/products/downgrade-git-lfs-storage
1432
# Original redirects
1533
- /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage
1634
- /articles/about-billing-for-git-large-file-storage

content/billing/concepts/product-billing/github-advanced-security.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ title: '{% data variables.product.prodname_GHAS %} license billing'
33
intro: 'Learn how usage of {% data variables.product.prodname_AS %} features is measured and how to pay for additional licenses.'
44
product: '{% data reusables.gated-features.ghas-billing %}'
55
redirect_from:
6+
# Article on migrating to two separate SKUs
7+
- /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp
8+
- /billing/how-tos/products/migrate-from-ghas
9+
# This article
610
- /admin/advanced-security/about-licensing-for-github-advanced-security
711
- /billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
812
- /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security
@@ -89,11 +93,9 @@ There are two different ways to pay for licenses.
8993
9094
* **Volume/subscription billing** available for {% data variables.product.prodname_enterprise %} plans only
9195

92-
* Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year.
96+
* Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year, see {% ifversion fpt or ghec %}[AUTOTITLE](/billing/how-tos/products/add-advanced-security){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/how-tos/products/add-advanced-security) in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}.
9397
* If the usage of {% data variables.product.prodname_AS %} by active committers exceeds the number of licenses purchased, you need to purchase additional licenses to cover this overage usage.
9498

95-
If you want to purchase volume/subscription-based licenses, contact your account manager in {% data variables.contact.contact_enterprise_sales %} or contact {% data variables.contact.contact_support_page %}.
96-
9799
<!-- expires 2025-08-31 -->
98100
<!--This versioning is not needed once the related EDI PR for this article is merged (#57129).-->
99101
{% ifversion fpt or ghec %}To view your current license usage, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage).{% endif %}
@@ -146,7 +148,9 @@ You can enforce policies to allow or disallow the use of {% data variables.produ
146148
147149
## Further reading
148150

149-
{% ifversion fpt or ghec or ghes > 3.14 %}
151+
{%- ifversion fpt or ghec or ghes > 3.15 %}
152+
* [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas){% endif %}
153+
{%- ifversion fpt or ghec or ghes > 3.14 %}
150154
* [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale){% endif %}
151155
{%- ifversion fpt or ghec or ghes > 3.15 %}
152156
* [AUTOTITLE](/admin/managing-code-security/securing-your-enterprise/about-security-configurations){% else %}

content/billing/how-tos/manage-plan-and-licenses/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ children:
2929
- /manage-user-licenses
3030
contentType: how-tos
3131
---
32-
Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: Adding GitHub Advanced Security to your organization or enterprise
3-
intro: 'You can sign up for GitHub Advanced Security products from the settings for your organization or enterprise account to prevent data leaks and keep vulnerabilities out of your codebase.'
4-
permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}'
2+
title: Buying Advanced Security for your organization or enterprise
3+
intro: 'How to buy licenses for {% data variables.product.prodname_GHAS %} whether you have usage-based or volume/subscription billing.'
4+
permissions: 'Organization or enterprise owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}'
55
product: '{% data reusables.gated-features.ghas-billing %}'
66
versions:
77
fpt: '*'
@@ -13,59 +13,60 @@ topics:
1313
- Billing
1414
- Advanced Security
1515
- Enterprise
16-
shortTitle: Add Advanced Security
16+
shortTitle: Buy Advanced Security
17+
allowTitleToDifferFromFilename: true
1718
contentType: how-tos
1819
---
1920

2021
## Checking your current plan
2122

22-
Your organization must use a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan before you can enable {% data variables.product.prodname_GH_cs_or_sp %} on private repositories.
23+
You must use a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan before you can enable {% data variables.product.prodname_GH_cs_or_sp %} on private repositories.
2324

24-
{% data reusables.profile.access_org %}
25-
{% data reusables.profile.org_settings %}
26-
{% data reusables.organizations.billing_plans_or_licensing %}
25+
1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture.
26+
27+
1. Select the account you want to view and then access the "Billing & Licensing" pages:
28+
29+
* **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**.
30+
31+
* **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page.
32+
33+
1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page.
2734

2835
Your current plan is shown with any options to upgrade to a different plan.
2936

30-
## Starting to use {% data variables.product.prodname_AS %}
37+
## Metered billing users
3138

32-
{% ifversion fpt %}
33-
If your organization uses a {% data variables.product.prodname_team %} plan, you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %} at the organization and repository level. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes.
39+
If your organization or enterprise uses metered billing, then you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %}. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes.
3440

3541
The most effective way to control and enable these features is using security configurations, see [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/choosing-a-security-configuration-for-your-repositories).
3642

37-
{% elsif ghec %}
38-
If you use volume/subscription billing, then you will need to purchase licenses before you can start using {% data variables.product.prodname_GH_cs_or_sp %} on private or internal repositories.
39-
40-
If your enterprise uses metered billing, then you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %} at the enterprise, organization, and repository level. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes.
43+
## Volume/subscription users
4144

42-
{% endif %}
45+
If you use volume/subscription billing, then you will need to purchase licenses before you can start using {% data variables.product.prodname_GH_cs_or_sp %} on private or internal repositories.
4346

44-
## Purchasing licenses for organizations
47+
1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture.
4548

46-
{% data reusables.profile.access_org %}
47-
{% data reusables.profile.org_settings %}
48-
{% data reusables.organizations.billing_plans_or_licensing %}
49-
1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**.
49+
1. Select the account you want to view and then access the "Billing & Licensing" pages:
5050

51-
![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
51+
* **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**.
5252

53-
{% ifversion ghec %}
53+
* **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page.
5454

55-
## Purchasing licenses for enterprises
55+
1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page.
5656

57-
{% data reusables.enterprise-accounts.access-enterprise %}
58-
{% data reusables.enterprise-accounts.settings-tab %}
59-
{% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
6057
1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**.
6158

62-
![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
59+
![Screenshot of the {% data variables.product.prodname_AS %} section of the licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
6360

64-
{% data reusables.advanced-security.purchase-ghas %}
61+
1. Confirm your billing information and payment method.
62+
1. Under "How many committers do you want to include?", enter the number of committers you want to purchase licenses for.
63+
1. Click **Purchase Advanced Security**.
6564

66-
{% endif %}
65+
> [!TIP]
66+
> To see how license use by committers is measured, see [AUTOTITLE](/billing/concepts/product-billing/github-advanced-security).
6767
6868
## Further reading
6969

70+
* [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas)
7071
* [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale){% ifversion ghec %}
7172
* [AUTOTITLE](/code-security/adopting-github-advanced-security-at-scale/introduction-to-adopting-github-advanced-security-at-scale){% endif %}

content/billing/how-tos/products/downgrade-git-lfs-storage.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)