Repo sync

Dockerfile

@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20250328-000607-gf66d47491 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20250319-193531-g83d4e6244 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/billing/using-the-new-billing-platform/about-the-billing-cycle.md

@@ -16,8 +16,57 @@ product: '{% data reusables.billing.enhanced-billing-platform-product %}'
 >
 > To check if you are on the new billing platform, see [How do I know if I can access the new billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform).
 
-If your {% data variables.enterprise.enterprise_or_org %} {% ifversion fpt %}or personal account{% endif %} uses the new billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day {% ifversion fpt %}is the day you created your organization. For example, if you created the account{% elsif ghec %}is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted{% endif %} on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month.
+Your billing experience depends on whether your products are metered, volume-based, or a combination of both. Some products, like {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %}, can be either volume-based or metered, depending on when and how your account was created.
 
-This applies to all products available through the new billing platform.
+* **Metered**: Pay monthly for the number of licenses you use
+* **Volume-based**: Traditional annual subscriptions with a fixed number of licenses
 
-If you still use the previous billing platform, for more information about the billing cycle for your account, see [AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle).
+## Billing cycles for metered products
+
+If your {% data variables.enterprise.enterprise_or_org %} {% ifversion fpt %}or personal account{% endif %} uses the new billing platform for **metered** products, you have a fixed **billing period** that runs from the first day of each month to the last day of the month.
+
+At the end of each month, your metered usage is calculated and scheduled to be billed on your **bill cycle day**.
+
+{% ifversion fpt %}For personal accounts and organizations, your bill cycle day is typically the day you started a paid plan (not necessarily when the account was created).{% elsif ghec %}Your bill cycle day is typically determined by when you converted from a trial to a paid enterprise account.{% endif %} For example, if you {% ifversion fpt %}started a paid plan{% elsif ghec %}converted from a trial{% endif %} on the 15th of a month, you will be billed on the 15th of each subsequent month.
+
+## Billing cycles for volume-based products
+
+Volume-based licenses may follow a different billing cycle, even if your account is on the new billing platform. These products are often billed based on the anniversary date of your subscription rather than by calendar month.
+
+## How mid-cycle changes affect your billing
+
+Mid-cycle changes to your account can affect your bill.
+
+### Changes to metered products
+
+Metered products (such as {% data variables.product.prodname_actions %} minutes, {% data variables.product.prodname_registry %} storage, or {% data variables.product.prodname_codespaces %} compute) are billed based on your actual usage throughout the month. For more information on how usage is calculated for a specific product, see [Where to find usage details for specific products](#where-to-find-usage-details-for-specific-products).
+
+### Changes to volume-based products
+
+Volume-based products are billed per user, seat, or resource. Changes to these mid-cycle won’t always immediately change your bill—but they may affect your next invoice.
+
+#### Adding users or resources
+
+* **Add users or licenses**: For license-based products like {% data variables.product.prodname_copilot_short %}, {% data variables.product.prodname_enterprise %}, or {% data variables.product.prodname_GHAS %}, you'll be billed a **prorated amount** based on how many days remain in the current billing cycle.
+* **Add organizations or repositories**: These will also result in **prorated charges**, which appear on your next invoice.
+
+#### Removing users or resources
+
+* **Remove users or seats**: The user’s access is revoked immediately, but you'll still be billed for the **full billing cycle**. Removing a user won't reduce your current bill.
+* **Remove organizations or repositories**: Charges **stop immediately** when removed, but you'll still be billed for any usage **up to that point**.
+
+#### Transferring users or resources
+
+* **Within the same billing account**: No double-billing. Moving users or resources between organizations under the same account is handled automatically.
+* **Between different billing accounts**: Each account is billed according to its own cycle. You may see charges in both accounts if the move overlaps billing periods.
+
+## Where to find usage details for specific products
+
+Find product-specific guidance on how usage is calculated and billed.
+
+* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions)
+* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)
+* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages)
+* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot)
+* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise#about-licenses-for-visual-studio-subscriptions-with-github-enterprise-cloud)
+* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)

content/code-security/security-overview/assessing-code-security-risk.md

@@ -26,14 +26,16 @@ redirect_from:
 You can use the different views on your **Security** tab to explore the security risks in your code.
 
 * **Overview:** use to explore trends in **Detection**, **Remediation**, and **Prevention** of security alerts.
-* **Risk:** use to explore the current state of repositories, across all alert types.
+* **Risk:** use to explore the current state of repositories, across all alert types.{% ifversion secret-risk-assessment %}
+* **Assessments:** use to explore the current state of repositories, for secret leaks specifically{% endif %}
 * **Alerts views:** use to explore {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_dependabot %}, or {% data variables.product.prodname_secret_scanning %} alerts in greater detail.
 
 These views provide you with the data and filters to:
 
 * Assess the landscape of security risk of code stored in all your repositories.
 * Identify the highest impact vulnerabilities to address.
-* Monitor your progress in remediating potential vulnerabilities. {% ifversion security-overview-export-data %}
+* Monitor your progress in remediating potential vulnerabilities.{% ifversion secret-risk-assessment %}
+* Understand how your organization is affected by secret leaks and exposures.{% endif %}{% ifversion security-overview-export-data %}
 * Export your current selection of data for further analysis and reporting.  {% endif %}
 
 {% ifversion security-overview-dashboard %}

content/code-security/security-overview/filtering-alerts-in-security-overview.md

@@ -121,7 +121,9 @@ In the "Risk" and "Coverage" views, you can show data only for repositories wher
 
 | Qualifier | Description |
 | -------- | -------- |
+| {% ifversion ghes < 3.17 %} |
 | `advanced-security` | Display data for repositories where {% data variables.product.prodname_GHAS %} is enabled or not enabled. |
+| {% endif %} |
 | `code-scanning-default-setup`| Display data for repositories where {% data variables.product.prodname_code_scanning %} is enabled or not enabled using {% data variables.product.prodname_codeql %} default setup. |
 | `code-scanning-pull-request-alerts`| Display data for repositories where {% data variables.product.prodname_code_scanning %} is enabled or not enabled to run on pull requests. |
 | `dependabot-security-updates` | Display data for repositories where {% data variables.product.prodname_dependabot_security_updates %} is enabled or not enabled.  |

content/enterprise-onboarding/getting-started-with-your-enterprise/index.md

@@ -4,7 +4,6 @@ title: Getting started with your enterprise
 intro: 'Learn how to start a trial of {% data variables.product.prodname_enterprise %}, and about enterprise billing and migrations.'
 versions:
   ghec: '*'
-  ghes: '*'
 topics:
   - Accounts
   - Enterprise

content/enterprise-onboarding/index.md

@@ -15,7 +15,6 @@ featuredLinks:
 layout: product-landing
 versions:
   ghec: '*'
-  ghes: '*'
 topics:
   - Administrator
   - Enterprise

content/site-policy/github-terms/github-terms-for-additional-products-and-features.md

@@ -14,16 +14,16 @@ topics:
   - Legal
 ---
 
-Version Effective Date: December 18, 2024
+Version Effective Date: April 1, 2025
 
 When you use GitHub, you may be given access to lots of additional products and features ("Additional Products and Features"). Because many of the Additional Products and Features offer different functionality, your Agreement with us (the "Agreement") includes the specific terms for that product or feature combined with your main agreement — the GitHub Terms of Service or GitHub Customer Agreement, or the GitHub Corporate Terms of Service or other legacy GitHub contract, or a Microsoft volume licensing agreement. Below, we've listed those products and features, along with the corresponding additional terms that apply to your use of them.
 
 By using the Additional Products and Features, you also agree to the applicable GitHub Terms for Additional Products and Features listed below. A violation of these GitHub Terms for Additional Products and Features is a violation of the Agreement. Capitalized terms not defined here have the meaning given in the Agreement.
 
 **For Enterprise users**
-* **GitHub Enterprise Cloud** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Codespaces, Dependabot Preview, GitHub Enterprise Importer, Packages, and Pages.
+* **GitHub Enterprise Cloud** users may have access to the following Additional Products and Features: Actions, Advanced Security (including Code Security and Secret Protection), Advisory Database, Codespaces, Dependabot, GitHub Enterprise Importer, Packages, and Pages.
 
-* **GitHub Enterprise Server** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Connect, Dependabot Preview, GitHub Enterprise Importer, Packages, Pages, and SQL Server Images.
+* **GitHub Enterprise Server** users may have access to the following Additional Products and Features: Actions, Advanced Security (including Code Security and Secret Protection), Advisory Database, Connect, Dependabot, GitHub Enterprise Importer, Packages, Pages, and SQL Server Images.
 
 ## Actions
 
@@ -56,11 +56,11 @@ If you use self-hosted runners, you have the ability to turn off automatic updat
 
 ## Advanced Security
 
-GitHub makes extra security features available to customers under an Advanced Security license. These features include code scanning, secret scanning, and dependency review. The [Advanced Security documentation](/get-started/learning-about-github/about-github-advanced-security) provides more details.
+GitHub makes extra security features available to customers under Advanced Security licenses. From April 1, 2025, features that were previously only available under a single GitHub Advanced Security license will be alternatively available under two separate licenses: GitHub Code Security (code scanning and dependency scanning features) and GitHub Secret Protection (secret scanning features).  The [Advanced Security documentation](/get-started/learning-about-github/about-github-advanced-security) provides more details.
 
-Advanced Security is licensed on a "Unique Committer" basis. A "Unique Committer" is a licensed user of GitHub Enterprise, GitHub Enterprise Cloud, or GitHub Enterprise Server, who has made a commit in the last 90 days to any repository with any GitHub Advanced Security functionality activated. You must acquire a GitHub Advanced Security User license for each of your Unique Committers. You may only use GitHub Advanced Security on codebases that are developed by or for you. For GitHub Enterprise Cloud users, some Advanced Security features also require the use of GitHub Actions.
+Advanced Security features are licensed on a "Unique Committer" basis. A "Unique Committer" is a licensed user of GitHub Team, GitHub Enterprise, GitHub Enterprise Cloud, or GitHub Enterprise Server, who has made a commit in the last 90 days to any repository with any GitHub Advanced Security functionality activated. You must acquire an appropriate GitHub Advanced Security User license for each of your Unique Committers. You may only use GitHub Advanced Security features on codebases that are developed by or for you. For GitHub Team and GitHub Enterprise Cloud users, some Advanced Security features may also require the use of GitHub Actions.
 
-For secret scanning with GitHub Advanced Security, when you opt-in to automatic validity checks for partner patterns, exposed third-party tokens may be shared with the relevant partner, in order to provide you with more information about the validity of the token. Not all partners are based in the United States. The [Secret scanning patterns documentation](/enterprise-cloud@latest/code-security/secret-scanning/introduction/supported-secret-scanning-patterns) provides more details on which partners support the validity check.
+For secret scanning with GitHub Advanced Security or GitHub Secret Protection, when you opt-in to automatic validity checks for partner patterns, exposed third-party tokens may be shared with the relevant partner, in order to provide you with more information about the validity of the token. Not all partners are based in the United States. The [Secret scanning patterns documentation](/enterprise-cloud@latest/code-security/secret-scanning/introduction/supported-secret-scanning-patterns) provides more details on which partners support the validity check.
 
 ## Advisory Database
 

data/ui.yml

@@ -55,6 +55,7 @@ search:
     thumbs_up: This answer was helpful
     thumbs_down: This answer was not helpful
     thumbs_announcement: Thank you for your feedback!
+    back_to_search: Back to search
   failure:
     general_title: There was an error loading search results.
     ai_title: There was an error loading Copilot.

src/fixtures/fixtures/data/ui.yml

@@ -55,6 +55,7 @@ search:
     thumbs_up: This answer was helpful
     thumbs_down: This answer was not helpful
     thumbs_announcement: Thank you for your feedback!
+    back_to_search: Back to search
   failure:
     general_title: There was an error loading search results.
     ai_title: There was an error loading Copilot.