Merge pull request github#36282 from github/repo-sync

Repo sync

.devcontainer/devcontainer.json

@@ -64,6 +64,6 @@
   "remoteUser": "node",
 
   "hostRequirements": {
-    "memory": "8gb"
+    "memory": "32gb"
   }
 }

config/moda/deployment.yaml

@@ -11,6 +11,7 @@ environments:
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
     secret_environment: production
+    required_review_tasks: []
     cluster_selector:
       profile: general
       region: iad
@@ -19,6 +20,7 @@ environments:
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
     secret_environment: production
+    required_review_tasks: []
     cluster_selector:
       profile: general
       region: iad
@@ -27,6 +29,7 @@ environments:
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
     secret_environment: production
+    required_review_tasks: []
     cluster_selector:
       profile: general
       region: iad

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md

@@ -25,13 +25,11 @@ You can create rulesets to control how users can interact with code in repositor
 
 To learn more, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
 
-## Importing prebuilt rulesets
+## Importing rulesets
 
 To import a prebuilt ruleset created by {% data variables.product.company_short %}, see [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes).
 
-{% ifversion repo-rules-management %}
 {% data reusables.repositories.import-a-ruleset-conceptual %} For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization#using-ruleset-history).
-{% endif %}
 
 ## How will I define where my ruleset applies?
 

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md

@@ -20,6 +20,9 @@ topics:
   - User account
 shortTitle: Cancel a Marketplace app
 ---
+
+{% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}
+
 When you cancel an app, your subscription remains active until the end of your current billing cycle. The cancellation takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 
 When you cancel a free trial on a paid plan, your subscription is immediately canceled and you will lose access to the app. If you don't cancel your free trial within the trial period, the payment method on file for your account will be charged for the plan you chose at the end of the trial period. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md

@@ -19,6 +19,9 @@ topics:
   - User account
 shortTitle: Downgrade billing plan
 ---
+
+{% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}
+
 When you downgrade an app, your subscription remains active until the end of your current billing cycle. The downgrade takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 
 {% data reusables.marketplace.downgrade-marketplace-only %}

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md

@@ -19,6 +19,9 @@ topics:
   - User account
 shortTitle: Upgrade billing plan
 ---
+
+{% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}
+
 When you upgrade an app, your payment method is charged a prorated amount based on the time remaining until your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 
 ## Upgrading an app for your personal account

content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md

@@ -30,6 +30,8 @@ topics:
 shortTitle: Downgrade plan
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 ## About downgrades
 
 When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Downgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see [AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process).

content/billing/managing-the-plan-for-your-github-account/index.md

@@ -31,3 +31,5 @@ children:
   - /one-time-payments-for-customers-in-india
   - /discounted-plans-for-github-accounts
 ---
+
+{% ifversion fpt %}{% data reusables.billing.enhanced-billing-platform-personal-accounts %}{% endif %}

content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md

@@ -32,6 +32,8 @@ topics:
 shortTitle: Upgrade your plan
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 ## About upgrades
 
 {% data reusables.accounts.accounts-billed-separately %}

content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md

@@ -19,6 +19,8 @@ topics:
 shortTitle: Pending plan changes
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 ## About pending plan changes
 
 You can cancel pending changes to your account's plan as well as pending changes to other subscriptions and usage-based billing.

content/billing/using-the-billing-platform/adding-a-sales-tax-certificate.md

@@ -12,6 +12,8 @@ topics:
 shortTitle: Add a sales tax certificate
 ---
 
+{% ifversion fpt %}{% data reusables.billing.enhanced-billing-platform-personal-accounts %}{% endif %}
+
 If you're a {% data variables.product.company_short %} customer in the United States, you need to ensure that your account is set up to calculate sales tax correctly. If you're exempt from sales tax, you can upload a certificate to your account. The format of the certificate you upload must be one of the following:
 
 * JPEG (`.jpg`, `.jpeg`)

content/billing/using-the-billing-platform/adding-information-to-your-receipts.md

@@ -25,6 +25,8 @@ topics:
 shortTitle: Add to your receipts
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 Your receipts include your {% data variables.product.prodname_dotcom %} subscription as well as any subscriptions for other paid features and products. For more information, see [AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github).
 
 > [!WARNING]

content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md

@@ -28,6 +28,8 @@ topics:
 shortTitle: Manage a payment method
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 {% data reusables.dotcom_billing.payment-methods %} {% data reusables.dotcom_billing.same-payment-method %}
 
 We don't support purchase orders for personal accounts. We email receipts monthly or yearly on your account's billing date. If your company, country, or accountant requires your receipts to provide more detail, you can add extra information to your receipts. For more information, see [AUTOTITLE](/billing/managing-your-github-billing-settings/adding-information-to-your-receipts).

content/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle.md

@@ -19,6 +19,9 @@ topics:
   - User account
 shortTitle: Billing cycle
 ---
+
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 When you change your billing cycle's duration, your {% data variables.product.prodname_dotcom %} subscription, along with any other paid features and products, will be moved to your new billing cycle on your next billing date.
 
 > [!NOTE]

content/billing/using-the-billing-platform/viewing-your-payment-history-and-receipts.md

@@ -21,6 +21,8 @@ topics:
 shortTitle: View history & receipts
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 ## Viewing receipts for your personal account
 
 {% data reusables.user-settings.access_settings %}

content/billing/using-the-billing-platform/viewing-your-subscriptions-and-billing-date.md

@@ -20,6 +20,9 @@ topics:
   - User account
 shortTitle: Subscriptions & billing date
 ---
+
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 ## Finding your personal account's next billing date
 
 {% data reusables.user-settings.access_settings %}

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

@@ -12,11 +12,11 @@ topics:
 product: '{% data reusables.billing.enhanced-billing-platform-product %}'
 ---
 
->[!IMPORTANT] {% ifversion fpt %}If you want to know about billing for your personal user account, this article does not apply to you.{% elsif ghec %}If you have not migrated to the enhanced billing platform, this article does not apply to you.{% endif %}
+>[!IMPORTANT] {% ifversion fpt %}If you signed up for a personal user account before February 13, 2025, this article does not apply to you. However, if you created a new personal account (on {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}) after this date, the information in this article applies.{% elsif ghec %}If you have not migrated to the enhanced billing platform, this article does not apply to you.{% endif %}
 >
 > To check if you are on the enhanced billing platform, see [How do I know if I can access the enhanced 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 %} uses the enhanced 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.
+If your {% data variables.enterprise.enterprise_or_org %} {% ifversion fpt %}or personal account{% endif %} uses the enhanced 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.
 
 This applies to all products available through the enhanced billing platform.
 

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

@@ -20,6 +20,20 @@ The enhanced billing platform provides better spending control and detailed usag
 
 The products shown in the enhanced billing platform are determined by your {% data variables.product.github %} plan and subscriptions.
 
+{% ifversion fpt %}
+
+### Personal accounts on {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}
+
+* {% data variables.product.prodname_actions %}
+* {% data variables.product.prodname_github_codespaces %}
+* {% data variables.product.prodname_copilot %}
+* {% data variables.product.prodname_registry %}
+* {% data variables.large_files.product_name_long %}
+* {% data variables.product.prodname_marketplace %}
+* {% data variables.product.prodname_sponsors %}
+
+{% endif %}
+
 ### Organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %}
 
 * {% data variables.product.prodname_actions %}
@@ -68,8 +82,10 @@ With the new billing platform, you can:
 
 {% ifversion fpt %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
+1. In the upper-right corner of any page on {% data variables.product.prodname_dotcom %}, select your profile photo.
+
+   * For **personal accounts**, click **Settings**.
+   * For **organizations**, click **Your organizations**, then next to the organization, click **Settings**.
 
 {% elsif ghec %}
 

content/billing/using-the-new-billing-platform/estimating-spending.md

@@ -17,7 +17,32 @@ shortTitle: Estimate spending
 
 The enhanced billing platform provides a high-level view of your spending trends based on the usage across products. You can use this information to estimate your spending and make informed decisions about your budget.
 
-## Viewing your spending
+{% ifversion fpt %}
+
+## Viewing your spending for your personal account
+
+{% data reusables.user-settings.access_settings %}
+1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.
+
+On this page, you can view your usage in the following categories:
+
+* **Current metered usage:** The card on the top left shows the gross metered usage for your personal account.
+* **Metered usage:** The graph shows the gross metered usage for your personal account.
+
+   To view a different time period, select **Time Frame**, then choose a time period. You can also download an image or CSV of the graph by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} on the right.
+
+* **By repository:** The card under the graph shows the top five repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage, including a break down by gross usage versus billable usage (minus any discounts that may apply).
+* **By products:** You can use the product tabs to view usage and discounts for different products.
+
+    ![Screenshot of the product tabs section of the overview page.](/assets/images/help/billing/enhanced-billing-platform-products-tabs.png)
+
+Additionally, you can change your plan by clicking **Upgrade to Pro** or **Downgrade to Free** in the "Current plan" section.
+
+At the top of the page, under "Next payment due", you can see the date of your next billing cycle.
+
+{% endif %}
+
+## Viewing your spending for your {% data variables.enterprise.enterprise_or_org %}
 
 The "Overview" page provides a high-level view of your spending and budgets.
 

content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md

@@ -16,10 +16,35 @@ shortTitle: Gather insights
 
 The new billing platform provides you with the tools to:
 
-* **Get insights** into the usage of your {% data variables.enterprise.enterprise_or_org %} members to understand how your resources are being used.
-* **Generate reports** on the usage of your {% data variables.enterprise.enterprise_or_org %} members to import into your own tools for visualization and analysis.
+* **Get insights** into usage trends to understand how your resources are being used.
+* **Search and filter usage** by repository, product, or SKU, and group data accordingly.
+* **Generate reports** on past usage for various time periods, including the current hour, today, this month, last month, this year, last year, or a custom date range.
 
-## Viewing usage
+{% ifversion fpt %}
+
+## Viewing usage for your personal account
+
+You can view the usage of your personal account and download the usage data for further analysis.
+
+{% data reusables.user-settings.access_settings %}
+1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.
+1. Click **Usage**.
+1. To search or filter the graph, click the search bar. Then click the filter you want to use.
+1. To further filter the graph, use the dropdown menus.
+
+   * To see the usage by group, select **Group**, then click a group.
+   * To filter by time, select **Time Frame**, then click a time period.
+   * Optionally, to view the monthly budget and actual usage per day, select **Group: None** and **Time Frame: Current Month**.
+
+   Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, and actual usage.
+
+   >[!NOTE] The usage graph is configured to represent the start of the month to the end of the month, not your specific billing period.
+
+1. To request a CSV usage report, select **Get usage report** in the upper-right corner of the page. You can choose a pre-selected option or use the Custom range option to specify a date range of up to 31 days.
+
+{% endif %}
+
+## Viewing usage for your {% data variables.enterprise.enterprise_or_org %}
 
 You can view the usage of your {% data variables.enterprise.enterprise_or_org %} members and download the usage data for further analysis.
 

content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md

@@ -16,7 +16,7 @@ shortTitle: Get started
 If you don't already have access to the enhanced billing platform, you may be able to get started.
 
 {% ifversion fpt %}
-* If you are **new** to {% data variables.product.github %}, create an organization on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan.
+* If you are **new** to {% data variables.product.github %}, create a personal account on a {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %} plan or an organization on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan.
 {% endif %}
 * If you are **new** to {% data variables.product.prodname_ghe_cloud %}, set up a trial of {% data variables.product.prodname_ghe_cloud %}. See [AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud).
 {% ifversion ghec %}

content/billing/using-the-new-billing-platform/index.md

@@ -13,7 +13,7 @@ children:
   - /getting-started-with-the-new-billing-platform
   - /about-the-billing-cycle
   - /about-usage-based-billing-for-licenses
-  - /adding-licenses-to-your-account
+  - /managing-licenses-and-plans-for-your-account
   - /roles-for-the-new-billing-platform
   - /estimating-spending
   - /gathering-insights-on-your-spending