Merge pull request #38060 from github/repo-sync

Repo sync

Author: docs-bot

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/types-of-emails-github-sends.md

@@ -30,7 +30,7 @@ You can also choose which type of email updates you'd like to receive on convers
 
 ## Account emails
 
-If you've upgraded to paid products or features, then you'll receive billing receipts at the account's primary email address. For more information, see [AUTOTITLE](/billing/managing-your-github-billing-settings/setting-your-billing-email).
+If you've upgraded to paid products or features, then you'll receive billing receipts at the account's primary email address. For more information, see [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information).
 
 ## Customer research emails
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/removing-yourself-from-an-organization.md

@@ -18,7 +18,7 @@ shortTitle: Leave an organization
 {% ifversion fpt or ghec %}
 
 > [!WARNING]
-> If you're currently responsible for paying for {% data variables.product.github %} in your organization, removing yourself from the organization **does not** update the billing information on file for the organization. If you are currently responsible for billing, **you must** have another owner or billing manager for the organization [update the organization's payment method](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method).
+> If you're currently responsible for paying for {% data variables.product.github %} in your organization, removing yourself from the organization **does not** update the billing information on file for the organization. If you are currently responsible for billing, **you must** have another owner or billing manager for the organization [update the organization's payment method](/billing/managing-your-billing/managing-your-payment-and-billing-information).
 >
 > For more information, see [AUTOTITLE](/organizations/managing-organization-settings/transferring-organization-ownership).
 

content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md

@@ -74,7 +74,7 @@ Using an **incognito or private browsing window**:
 
 To pay for licenses and services, you can use a credit card, PayPal, or a Microsoft Azure subscription.
 
-* To add a credit card or PayPal details, see [AUTOTITLE](/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information#viewing-payment-information).
+* To add a credit card or PayPal details, see [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information#viewing-payment-information).
 * To link an Azure subscription, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account).
 
 ## 3. Migrate data

content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md

@@ -40,7 +40,7 @@ If you use {% data variables.product.prodname_emus %}, the following limitations
 After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply.
 
 * **Two-factor authentication (2FA):** If required by the enterprise, members without 2FA, or with insecure 2FA, will be unable to access organization resources until they configure 2FA that meets the enterprise's 2FA security requirements.
-* **Enterprise licenses:** Members become part of the enterprise, and usage is billed to the enterprise account. You must ensure that the enterprise account has enough licenses to accommodate any new members. See [AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise).
+* **Enterprise licenses:** Members become part of the enterprise, and usage is billed to the enterprise account. You must ensure that the enterprise account has enough licenses to accommodate any new members. See [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise).
 * **Enterprise role management:** Enterprise owners can manage their roles within the organization. See [AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise).
 * **Enterprise policies:** Any policies applied to the enterprise will apply to the organization. {% data reusables.actions.org-to-enterprise-actions-permissions %}
 

content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -31,7 +31,7 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a
 * Access to **most** {% data variables.product.prodname_ghe_cloud %} features.{% ifversion metered-ghe-ghas %}
 * {% data variables.product.prodname_copilot_for_business %}
 * {% data variables.product.prodname_GH_cs_and_sp %}
-* Access to the **new billing platform**.{% ifversion enhanced-billing-platform %} See [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises).{% endif %}{% endif %}
+* Access to the **new billing platform**.{% ifversion enhanced-billing-platform %} See [AUTOTITLE](/billing/managing-your-billing/about-the-new-billing-platform).{% endif %}{% endif %}
 * An **enterprise account**, which allows you to manage multiple organizations. See [AUTOTITLE](/enterprise-cloud@latest/get-started/learning-about-github/types-of-github-accounts).
 * Up to **50 licenses** to grant access to users.
 
@@ -75,7 +75,7 @@ You can end your trial at any time by purchasing {% data variables.product.prodn
 If you **purchase {% data variables.product.prodname_enterprise %}**:
 
 {% ifversion metered-ghe-ghas %}
-* You can use usage-based billing for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %}, which means you pay monthly for the number of licenses you use. You will not need to buy a predefined number of licenses in advance. See [AUTOTITLE](/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses).
+* You can use usage-based billing for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %}, which means you pay monthly for the number of licenses you use. You will not need to buy a predefined number of licenses in advance. See [AUTOTITLE](/billing/managing-your-billing/about-usage-based-billing-for-licenses).
 
   If you did not set up a free trial and you want to use usage-based billing to pay for {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %} after the {% data variables.product.prodname_ghe_cloud %} trial ends, contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact).{% endif %}
 

content/apps/oauth-apps/using-oauth-apps/installing-an-oauth-app-in-your-organization.md

@@ -34,5 +34,5 @@ For more information about installing a {% data variables.product.prodname_githu
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)
+* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information)
 * [AUTOTITLE](/apps/oauth-apps/using-oauth-apps/installing-an-oauth-app-in-your-personal-account)

content/apps/oauth-apps/using-oauth-apps/installing-an-oauth-app-in-your-personal-account.md

@@ -32,5 +32,5 @@ For more information about installing a {% data variables.product.prodname_githu
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)
+* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information)
 * [AUTOTITLE](/apps/oauth-apps/using-oauth-apps/installing-an-oauth-app-in-your-organization)

content/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations.md

@@ -73,5 +73,5 @@ For enterprise managed user accounts, only enterprise owners can purchase and in
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)
+* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information)
 * [AUTOTITLE](/apps/using-github-apps/installing-an-app-in-your-personal-account)

content/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-personal-account.md

@@ -55,5 +55,5 @@ For more information about authorizing {% data variables.product.prodname_github
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)
+* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information)
 * [AUTOTITLE](/apps/using-github-apps/installing-an-app-in-your-organization)

content/billing/index.md

@@ -6,12 +6,13 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github
   - /categories/setting-up-and-managing-billing-and-payments-on-github
 introLinks:
-  overview: '{% ifversion fpt or ghec %}/billing/using-the-billing-platform/about-billing-on-github{% elsif ghes%}/billing/using-the-billing-platform/about-billing-for-your-enterprise{% endif %}'
+  overview: '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-billing-on-github{% elsif ghes%}/billing/managing-your-billing/about-billing-for-your-enterprise{% endif %}'
 featuredLinks:
   startHere:
-    - '{% ifversion fpt or ghec %}/billing/using-the-billing-platform/adding-or-editing-a-payment-method{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/using-the-billing-platform/setting-your-billing-email{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-new-billing-platform{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/managing-your-payment-and-billing-information{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-billing-cycle{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/preventing-overspending{% endif %}'
     - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
@@ -36,8 +37,7 @@ versions:
 topics:
   - Billing
 children:
-  - /using-the-billing-platform
-  - /using-the-new-billing-platform
+  - /managing-your-billing
   - /managing-the-plan-for-your-github-account
   - /managing-your-license-for-github-enterprise
   - /managing-billing-for-your-products