Merge pull request #36335 from github/repo-sync

Repo sync

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

@@ -31,16 +31,18 @@ If you started a trial of {% data variables.product.prodname_GH_advanced_securit
 
 There are a few key differences between metered and volume billing for {% data variables.product.prodname_GH_advanced_security %}.
 
-* **Metered billing:**
+* **GHE Metered billing**
 
   * Billed per active committer, with no pre-defined license limit.
   * No overage state, pay only for what you use.
 
-* **Volume billing:**
+* **GHE Volume/Subscription billing**
 
   * Purchase a defined number of licenses (for example, 100 licenses).
   * If usage exceeds purchased licenses, you will need to purchase additional licenses to cover this overage usage.
 
+For more detailed information about these two types of billing, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses).
+
 ### Managing committers and repositories
 
 {% data variables.product.prodname_GH_advanced_security %} is billed per committer and enabled by repository. If you remove a committer from an organization or enterprise, or if you disable {% data variables.product.prodname_GH_advanced_security %} on a repository, the committers will remain billable until the end of the current monthly billing cycle. Prorated billing applies only when a committer starts partway through the month. For examples of how committers are tracked and billed, see [Understanding usage](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#understanding-usage).

content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md

@@ -25,6 +25,13 @@ shortTitle: About licenses
 
 To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments.
 
+{% ifversion ghes %}
+
+{% data reusables.billing.license-type-overview %}
+{% data reusables.billing.license-models %}
+
+{% endif %}
+
 In order to use a {% data variables.product.prodname_ghe_server %} instance, you must upload a license file that {% data variables.product.company_short %} provides when you purchase, renew, or add user licenses to {% data variables.product.prodname_enterprise %}.
 
 ## About synchronization of license usage for {% data variables.product.prodname_enterprise %}

content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md

@@ -18,7 +18,12 @@ product: '{% data reusables.billing.enhanced-billing-platform-product %}'
 shortTitle: Usage-based billing for licenses
 ---
 
-With the enhanced billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance.
+## About usage-based billing
+
+With the enhanced billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance. Usage-based billing provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models.
+
+{% data reusables.billing.license-type-overview %}
+{% data reusables.billing.license-models %}
 
 If a user starts consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} during the month, you will pay pro rata for the user's license usage that month. If a user stops consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} during the month, your bill for the following month will reflect the change.
 

content/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis.md

@@ -227,6 +227,7 @@ The following examples are designed to give you an idea of some of the build com
 * C/C++ project built using `make`:
 
   ```shell
+  # Disable parallel execution via `-j1` or other techniques: https://www.gnu.org/software/make/manual/make.html#Parallel-Execution
   codeql database create cpp-database --language={% ifversion codeql-language-identifiers-311 %}c-cpp{% else %}cpp{% endif %} --command=make
   ```
 

data/reusables/billing/license-models.md

@@ -0,0 +1,17 @@
+### Comparison of licensing models
+
+{% rowheaders %}
+
+| License model                          | GHE (Metered)                          | GHE (Volume/subscription)             |
+|----------------------------------|-------------------------------------|------------------------------------|
+| **Billing type**                | Usage-based | Volume-based         |
+| **Cloud vs. Server**             | Cloud-first, with a Server use right for Cloud users | 1 user license covers both Cloud and Server (hybrid, Cloud-only, or Server-only) |
+| **Setup**            | Self-service | Manual setup via {% data variables.product.github %} Sales |
+| **Server license generation**    | Users generate their own {% data variables.product.prodname_enterprise %} Server license | License file provided by {% data variables.product.github %} Sales |
+| **License file scope**        | Covers Cloud-assigned users at time of generation | Covers all purchased users for both Cloud and Server |
+| **License expiration**           | Expires in 12 months | Aligned with volume license term |
+| **License key usage**            | Limits max Server users | Covers all users in the volume subscription |
+| **Required {% data variables.product.prodname_enterprise %} version**        | {% data variables.product.prodname_enterprise %} 3.13+, with {% data variables.product.prodname_github_connect %} | No specific version required |
+| **Billing model**                | Invoiced for users not assigned on Cloud via {% data variables.product.prodname_github_connect %} | Fixed cost based on purchased volume |
+
+{% endrowheaders %}

data/reusables/billing/license-type-overview.md

@@ -0,0 +1,13 @@
+### {% data variables.product.prodname_enterprise %} licensing models
+
+There are two types of {% data variables.product.prodname_enterprise %} (GHE) licenses.
+
+* **GHE (Metered)**: A cloud-first license where users must first be assigned to a {% data variables.product.prodname_ghe_cloud %} organization.
+    * All Cloud users automatically receive a use right for {% data variables.product.prodname_ghe_server %}.
+    * Billing is based on the number of active users each month.
+    * Users can generate their own Server license, which covers the number of assigned Cloud seats at the time of generation and is valid for one year.
+
+* **GHE (Volume/Subscription, also called GHE Unified)**: A bundled license for both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.
+    * One license covers both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, allowing users to work in either or both.
+    * Users can access both services via {% data variables.product.prodname_github_connect %}.
+    * This license requires manual setup and is provided by {% data variables.product.github %} Sales.