Merge pull request #38497 from github/repo-sync

Repo sync

Author: docs-bot

content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md

@@ -20,8 +20,6 @@ topics:
 shortTitle: Downgrade Git LFS storage
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}
-
 When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage).
 
 ## Downgrading storage and bandwidth for a personal account

content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md

@@ -20,4 +20,3 @@ children:
   - /downgrading-git-large-file-storage
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}

content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md

@@ -20,8 +20,6 @@ topics:
 shortTitle: Upgrade Git LFS storage
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}
-
 ## Purchasing additional storage and bandwidth for a personal account
 
 {% data reusables.user-settings.access_settings %}

content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md

@@ -19,8 +19,6 @@ topics:
 shortTitle: View Git LFS usage
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}
-
 {% data reusables.large_files.owner_quota_only %} {% data reusables.large_files.does_not_carry %}
 
 ## Viewing storage and bandwidth usage for a personal account

content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md

@@ -16,8 +16,6 @@ topics:
 shortTitle: Billing for GitHub Actions
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}
-
 ## About billing for {% data variables.product.prodname_actions %}
 
 {% data reusables.billing.authorization-charge %}
@@ -33,7 +31,7 @@ Minutes reset every month, while storage usage does not.
 ### Included storage and minutes
 
 > [!NOTE]
-> * Included minutes cannot be used for larger runners. These runners will always be charged for, including in public repositories. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates).
+> * Included minutes cannot be used for larger runners. These runners will always be charged for, including in public repositories. For more information, see [Per-minute rates](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates).
 > * Logs and job summaries do not count towards storage usage.
 
 |Plan | Storage | Minutes (per month)|
@@ -44,13 +42,11 @@ Minutes reset every month, while storage usage does not.
 | {% data variables.product.prodname_team %} | 2 GB | 3,000 |
 | {% data variables.product.prodname_ghe_cloud %} | 50 GB | 50,000 |
 
-The storage used by a repository is the total storage used by {% data variables.product.prodname_actions %} artifacts and {% data variables.product.prodname_registry %}. Your storage cost is the total usage for all repositories owned by your account. For more information about pricing for {% data variables.product.prodname_registry %}, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages).
-
-If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day and per-minute usage depending on the operating system used by the {% data variables.product.prodname_dotcom %}-hosted runner. {% data variables.product.prodname_dotcom %} rounds the minutes and partial minutes each job uses up to the nearest whole minute.
+If your account's storage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day.
 
 ### Minute multipliers
 
-Jobs that run on Windows and macOS runners that {% data variables.product.prodname_dotcom %} hosts consume minutes at 2 and 10 times the rate that jobs on Linux runners consume. For example, using 1,000 Windows minutes would consume 2,000 of the minutes included in your account. Using 1,000 macOS minutes, would consume 10,000 minutes included in your account.
+Jobs that run on Windows and macOS runners that {% data variables.product.prodname_dotcom %} hosts consume minutes at 2 and 10 times the rate that jobs on Linux runners consume.
 
 | Operating system | Minute multiplier |
 |----------------- | ------------------|
@@ -59,10 +55,12 @@ Jobs that run on Windows and macOS runners that {% data variables.product.prodna
 | macOS            | 10                |
 
 > [!NOTE]
-> Minute multipliers do not apply to the per-minute rates shown below.
+> The billing dashboard may show your Actions usage as a dollar amount ("spend") rather than raw minutes. This amount already reflects the minute multipliers above. If you're using macOS or Windows runners, you will use up your included minutes more quickly
 
 ### Per-minute rates
 
+{% data variables.product.github %} rounds the minutes and partial minutes each job uses up to the nearest whole minute.
+
 #### Per-minute rates for standard runners
 
 | Operating system                      | Per-minute rate (USD) |

content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md

@@ -14,4 +14,3 @@ children:
   - /managing-your-spending-limit-for-github-actions
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}

content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md

@@ -18,8 +18,6 @@ topics:
 shortTitle: Spending limits for Actions
 ---
 
-{% data reusables.billing.enhanced-billing-platform %}
-
 ## About spending limits for {% data variables.product.prodname_actions %}
 
 {% data reusables.actions.actions-billing %}

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md

@@ -32,11 +32,11 @@ You need pay to use {% data variables.product.prodname_AS %} features in private
 
 ## License types for {% data variables.product.prodname_AS %} products
 
-Licensing for {% data variables.product.prodname_AS %} products is flexible, making it easy for you to choose options that fit your business needs. {% ifversion ghec or ghes %}You can buy volume/subscription licenses for any combination of the following products or use metered billing to pay for your use:{% endif %}
+{% data variables.product.prodname_AS %} consists of two main products:
 
 {% data reusables.advanced-security.ghas-products-bullets+ghas %}
 
-For example, you might start by using {% data variables.product.prodname_GH_secret_protection %} across all repositories, and pilot {% data variables.product.prodname_GH_code_security %} in high-risk repositories. You {% ifversion ghec or ghes %}buy or {% endif %}pay only for the products you need, and expand as you see the benefits to the security of your code.
+Licensing for {% data variables.product.prodname_AS %} products is flexible, making it easy for you to choose options that fit your business needs. For example, you might start by using {% data variables.product.prodname_GH_secret_protection %} across all repositories, and pilot {% data variables.product.prodname_GH_code_security %} in high-risk repositories. You buy or pay only for the products you need, and expand as you see the benefits to the security of your code.
 
 For more information, see [feature summary and pricing information](https://github.com/enterprise/advanced-security#pricing) and [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
 
@@ -51,7 +51,7 @@ Each active committer to at least one repository with an {% data variables.produ
 
 There are two different ways to pay for licenses.
 
-* **Metered billing** {% ifversion ghec %}introduced from June 2024 onward{% elsif ghes %}available from {% data variables.product.prodname_ghe_server %} 3.13 onward with {% data variables.product.prodname_github_connect %}{% endif %}
+* **Metered billing** {% ifversion ghes %}available from {% data variables.product.prodname_ghe_server %} 3.13 onward with {% data variables.product.prodname_github_connect %}{% endif %}
 
   * Users can enable {% data variables.product.prodname_GH_cs_or_sp %} independently.
   * Monthly bill for the number of licenses used by active committers.
@@ -64,10 +64,11 @@ There are two different ways to pay for licenses.
 
 * **Volume/subscription billing** available for {% data variables.product.prodname_enterprise %} plans only
 
-  * Users must ask the sales team to set up billing.
   * 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.
   * 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.
 
+   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 %}.
+
 ## Managing committers and costs
 
 {% ifversion fpt %}

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md

@@ -63,9 +63,7 @@ If you already pay to use {% data variables.product.prodname_AS %} features, the
 
 {% ifversion ghec %}
 
-If you are an existing self-serve customer, instructions on how to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %} SKUs will be announced over the next 30 days.
-
-You'll receive an email notification when the new plans are available to your enterprise. Transitioning to the two separate products will be self-serve and optional.
+If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:[email protected]).
 
 {% elsif ghes %}
 
@@ -77,7 +75,8 @@ If you have a hybrid {% data variables.product.prodname_ghe_cloud %} and {% data
 
 ### Volume/subscription billing users
 
-When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing.
+* **Invoiced**: When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing.
+* **Self-serve**: If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:[email protected]).
 
 ### Questions?
 

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md

@@ -30,7 +30,6 @@ To set up a trial of {% data variables.product.prodname_GHAS %} using this metho
 ## Setting up your trial of {% data variables.product.prodname_GHAS %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
 1. To the right of "{% data variables.product.prodname_GHAS %}", click **Start free trial**.
 1. Click **Start trial**.