[EDI] Audit and implement: /billing/how-tos/manage-for-client/* (#57052)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Anne-Marie <102995847+am-stead@users.noreply.github.com>

content/billing/how-tos/manage-for-client/create-as-csp-partner.md

@@ -10,22 +10,23 @@ topics:
   - Enterprise
   - Upgrades
 shortTitle: Create as CSP partner
+product: 'Microsoft Cloud Solution Provider (CSP) partners setting up {% data variables.product.prodname_enterprise %}. <br>{% data variables.product.github %} partners should see [AUTOTITLE](/billing/how-tos/manage-for-client/create-client-enterprise).'
 redirect_from:
   - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-an-enterprise-account-as-a-microsoft-csp-partner
 contentType: how-tos
 ---
 
-As a Microsoft Cloud Solution Provider (CSP) partner, you can create an enterprise account on {% data variables.product.prodname_dotcom %} on behalf of your customer. You can also invite your customer to become an enterprise owner.
+## Prerequisites
-
-## Requirements
 
 Before you start, make sure you know:
-* The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the enterprise account you create
+* {% data variables.product.github %} username of the client who will become the owner of the enterprise you create
-* The {% data variables.product.prodname_dotcom %} username for the CSP partner that must be assigned to the customer’s enterprise account to manage metered billing and access support
+* {% data variables.product.github %} username for the CSP partner that must be assigned to the customer’s enterprise account to manage metered billing and access support
-* The name your client would like to use for the enterprise account
+* Enterprise name your client would like to use
-* The email address where you would like receipts to be sent
+* Email address for receipts
+* Number of seats your client needs in the enterprise
+* Enterprise account type required by your client, see [AUTOTITLE](/admin/managing-iam/understanding-iam-for-enterprises/choosing-an-enterprise-type-for-github-enterprise-cloud)
 
-## Step 1: Create the enterprise account
+## Step 1: Create the enterprise account in the Azure portal
 
 As a Microsoft CSP partner, you can get started with {% data variables.product.prodname_enterprise %} from the Microsoft Azure portal.
 
@@ -46,7 +47,7 @@ At any time during the trial, you can purchase {% data variables.product.prodnam
 1. To sign in to your Microsoft account, follow the prompts.
 1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**.
 
-   If you don't see a "Permissions requested" prompt, and instead see a message indicating that you need admin approval, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#message-need-admin-approval).
+   If you don't see a "Permissions requested" prompt, and instead see a message indicating that you need admin approval, see [AUTOTITLE](/billing/how-tos/troubleshooting/azure-sub-connection).
 
 1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your organization. {% data reusables.enterprise-accounts.tenant-app-permissions %}
    {% data reusables.enterprise-accounts.connect-azure %}

content/billing/how-tos/manage-for-client/create-client-enterprise.md

@@ -10,21 +10,21 @@ topics:
   - Enterprise
   - Upgrades
 shortTitle: Create client enterprise
+product: '{% data variables.product.github %} partners setting up {% data variables.product.prodname_enterprise %}. <br> Microsoft Cloud Solution Provider (CSP) partners should see [AUTOTITLE](/billing/how-tos/manage-for-client/create-as-csp-partner).'
 redirect_from:
   - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/about-enterprise-accounts-for-procurement-companies
   - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client
 contentType: how-tos
 ---
 
->[!NOTE] If you are a Microsoft Cloud Solution Provider (CSP) partner and want to create an enterprise account for your customer, see [AUTOTITLE](/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-an-enterprise-account-as-a-microsoft-csp-partner).
+## Prerequisites
-
-## Requirements
 
 Before you start, make sure you know:
-* The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the enterprise account you create
+* {% data variables.product.github %} username of the client who will become the owner of the enterprise you create
-* The name your client would like to use for the enterprise account
+* Enterprise name your client would like to use
-* The email address where you would like receipts to be sent
+* Email address for receipts
-* The number of paid seats your client would like you to purchase for the enterprise account (see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing))
+* Number of seats your client needs in the enterprise
+* Enterprise account type required by your client, see [AUTOTITLE](/admin/managing-iam/understanding-iam-for-enterprises/choosing-an-enterprise-type-for-github-enterprise-cloud)
 
 ## Step 1: Create your personal account on {% data variables.product.prodname_dotcom %}
 
@@ -37,7 +37,12 @@ If you already have a personal account on {% data variables.product.prodname_dot
 ## Step 2: Create the enterprise account
 
 {% data reusables.enterprise.create-enterprise-account %}
+1. Depending on your client's requirements:
+   * Enterprise with personal accounts on {% data variables.product.prodname_dotcom_the_website %}: click **Get started with personal accounts**
+   * Enterprise with managed users, and optional data residence: click **Get started with managed users**
 1. Complete the form with your client's information.
+
+   If you chose Enterprise managed users, define your data hosting requirements [AUTOTITLE](/admin/data-residency/about-github-enterprise-cloud-with-data-residency).
 1. Click **Create your enterprise**.
 
 ## Step 3: Upgrade the enterprise to a yearly paid subscription
@@ -64,5 +69,6 @@ Invite your client to become an enterprise owner. For more information, see [AUT
 
 ## Next steps
 
-{% ifversion fpt %}1. If you would like your credit card to be removed from the enterprise account so that it's not charged again, contact {% data variables.contact.contact_support %}.
+1. Contact your client and ask them to add you to the enterprise as a billing manager. You'll need to be a billing manager for the enterprise so that you can renew or make changes to your client's subscription in the future. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise).
-1. {% endif %}When it's time to renew your client's paid subscription, see [AUTOTITLE](/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/renewing-your-clients-enterprise-account).
+1. Your client's paid subscription will automatically renew unless you remove your company's payment method from the enterprise, see [AUTOTITLE](/billing/how-tos/set-up-payment/manage-payment-info).
+1. If you want to remove your company's credit card from the enterprise so that it's not automatically charged for renewals and any other costs, contact {% data variables.contact.contact_support %}.

content/billing/how-tos/manage-for-client/create-client-org.md

@@ -16,6 +16,7 @@ redirect_from:
 versions:
   fpt: '*'
   ghec: '*'
+product: '{% data variables.product.github %} partners setting up {% data variables.product.prodname_team %}'
 topics:
   - Billing
   - User account
@@ -25,14 +26,15 @@ shortTitle: Create client org
 contentType: how-tos
 ---
 
-## Requirements
+If you want to create an enterprise account for a client, see [AUTOTITLE](/billing/how-tos/manage-for-client/create-client-enterprise) or [AUTOTITLE](/billing/how-tos/manage-for-client/create-as-csp-partner).
+
+## Prerequisites
 
 Before you start, make sure you know:
-* The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the organization you create
+* {% data variables.product.github %} username of the client who will become the owner of the organization you create
-* The name your client would like to use for the organization
+* Organization name your client would like to use
-* The email address where you would like receipts to be sent
+* Email address for receipts
-* The [product](/get-started/learning-about-github/githubs-plans) your client would like to purchase
+* Number of seats your client needs in the organization
-* The number of [paid seats](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing) your client would like you to purchase for the organization
 
 ## Step 1: Create your personal {% data variables.product.prodname_dotcom %} account
 
@@ -53,27 +55,18 @@ If you already have a personal account on {% data variables.product.prodname_dot
 {% data reusables.dotcom_billing.owned_by_business %}
 1. Click **Next**.
 
-## Step 3: Upgrade the organization to a yearly paid subscription
+## Step 3: Upgrade the organization to a paid plan with yearly payment
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing_plans_or_licensing %}
 {% data reusables.dotcom_billing.upgrade_org %}
-{% data reusables.dotcom_billing.choose_org_plan %} (You can add more seats to the organization in the next step.)
+1. Under "How often do you want to be billed?", select **Pay yearly** to pay for the organization yearly.
-1. Under "Upgrade summary", select **Pay yearly** to pay for the organization yearly.
+1. Under "How many seats do you want to include?", define the number of seats you require.
 {% data reusables.dotcom_billing.enter-payment-info %}
-{% data reusables.dotcom_billing.finish_upgrade %}
+1. Review the information, then click **Save** to confirm the changes.
 
-## Step 4: Upgrade the number of paid seats in the organization
+## Step 4: Invite your client to join the organization
-
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
-{% data reusables.dotcom_billing.add-seats %}
-{% data reusables.dotcom_billing.number-of-seats %}
-{% data reusables.dotcom_billing.confirm-add-seats %}
-
-## Step 5: Invite your client to join the organization
 
 {% data reusables.profile.access_org %}
 {% data reusables.user-settings.access_org %}
@@ -81,9 +74,12 @@ If you already have a personal account on {% data variables.product.prodname_dot
 {% data reusables.organizations.invite_member_from_people_tab %}
 1. In the search field, type your client's {% data variables.product.prodname_dotcom %} username and press **Enter**.
 1. Select **Owner**, then click **Send invitation**.
-1. Your client will receive an email inviting them to the organization. They will need to accept the invitation before you can move on to the next step.
+1. Your client will receive an email inviting them to the organization.
 
-## Step 6: Transfer organization ownership to your client
+>[!NOTE]
+> You cannot move on to the next step until your client accepts the invitation to become an organization owner.
+
+## Step 5: Transfer organization ownership to your client
 
 {% data reusables.profile.access_org %}
 {% data reusables.user-settings.access_org %}
@@ -97,6 +93,6 @@ If you already have a personal account on {% data variables.product.prodname_dot
 
 ## Next steps
 
-1. Contact your client and ask them to [add you to the organization as a billing manager](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization). You'll need to be a billing manager for the organization so that you can renew or make changes to your client's subscription in the future.
+1. Contact your client and ask them to add you to the organization as a billing manager. You'll need to be a billing manager for the organization so that you can renew or make changes to your client's subscription in the future. See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization).
-1. If you would like your organization's credit card to be removed from the organization so that it's not charged again, contact {% data variables.contact.contact_support %}.
+1. Your client's paid subscription will automatically renew unless you remove your company's payment method from the organization. See [AUTOTITLE](/billing/how-tos/manage-for-client/manage-client-org).
-1. When it's time to renew your client's paid subscription, see [AUTOTITLE](/articles/renewing-your-client-s-paid-organization).
+1. If you want to remove your company's credit card from the organization so that it's not automatically charged for renewals and any other costs, contact {% data variables.contact.contact_support %}.

content/billing/how-tos/manage-for-client/index.md

@@ -14,16 +14,12 @@ redirect_from:
 versions:
   fpt: '*'
   ghec: '*'
-  ghes: '*'
 topics:
   - Billing
 children:
   - create-client-org
   - create-client-enterprise
   - create-as-csp-partner
-  - renew-client-enterprise
-  - renew-client-organization
   - manage-client-org
 contentType: how-tos
 ---
-

content/billing/how-tos/manage-for-client/manage-client-org.md

@@ -1,17 +1,26 @@
 ---
-title: Upgrading or downgrading your client's paid organization
+title: Managing your client's paid organization
-intro: Billing managers can upgrade or downgrade a client's paid organization at any time.
+intro: Billing managers can upgrade or downgrade a client's paid organization at any time, and set their plan to renew.
 redirect_from:
+## Renewing article's redirects
+  - /github/setting-up-and-managing-billing-and-payments-on-github/renewing-your-clients-paid-organization
+  - /articles/renewing-your-client-s-paid-organization
+  - /articles/renewing-your-clients-paid-organization
+  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
+  - /billing/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
+  - /billing/how-tos/manage-for-client/renew-client-organization
+## Original article's redirects
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-or-downgrading-your-clients-paid-organization
   - /articles/upgrading-or-downgrading-your-client-s-paid-organization
   - /articles/upgrading-or-downgrading-your-clients-paid-organization
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
   - /billing/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
   - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
-
 versions:
   fpt: '*'
   ghec: '*'
+permissions: 'Billing manager or organization owner'
 topics:
   - Billing
   - Organizations
@@ -19,13 +28,20 @@ topics:
 shortTitle: Manage client org
 contentType: how-tos
 ---
-{% data reusables.organizations.reseller-ask-to-become-billing-manager %}
 
-> [!TIP]
+If you're not already billing manager for the organization, an organization owner at your client will need to add you to the organization as a billing manager. See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization).
-> * Before you upgrade your client's organization, you can [view or update the payment method on file for the organization](/billing/managing-your-billing/managing-your-payment-and-billing-information).
-> * These instructions are for upgrading and downgrading organizations on the _per-seat subscription_. If your client pays for {% data variables.product.github %} using a _legacy per-repository_ plan, you can upgrade or [downgrade](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) their legacy plan, or [switch their organization to per-seat pricing](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan).
 
-## Upgrading an organization's number of paid seats
+## Renewing a client's paid plan
+
+If your client's organization already has a valid payment method, the plan will automatically renew at the start of each billing cycle. Otherwise, you or the client will need to add a payment method.
+
+{% data reusables.organizations.billing-settings %}
+{% data reusables.dotcom_billing.update_payment_method_organization_account %}
+1. Under "Payment method", click **New Card**.
+![Screenshot of the "Payment method" section. Below some card details, a link, labeled "New Card", is highlighted with an orange outline.](/assets/images/help/billing/billing-new-card-button.png)
+{% data reusables.dotcom_billing.enter-payment-info %}
+
+## Upgrading the number of paid seats
 
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.add-seats %}
@@ -34,7 +50,7 @@ contentType: how-tos
 
 After you add seats, the payment method on file for the organization will be charged a pro-rated amount based on the number of seats you're adding and the amount of time left in your billing cycle.
 
-## Downgrading an organization's number of paid seats to free
+## Downgrading an organization's plan to free
 
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.downgrade-org-to-free %}

content/billing/how-tos/manage-for-client/renew-client-enterprise.md

@@ -1,27 +0,0 @@
----
-title: Renewing your client's enterprise account
-intro: You can renew your client's enterprise account by adding a payment method.
-versions:
-  fpt: '*'
-  ghec: '*'
-topics:
-  - Billing
-  - Enterprise
-shortTitle: Renew client enterprise
-redirect_from:
-  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/renewing-your-clients-enterprise-account
-contentType: how-tos
----
-
-If your client's enterprise account has a valid payment method on file, their yearly subscription will automatically renew. If not, you can renew the enterprise account by adding a payment method.
-
-You must be a billing manager to add a payment method. If you're not already a billing manager, ask your client to have an enterprise owner add you. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise#inviting-an-enterprise-administrator-to-your-enterprise-account).
-
-{% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.billing-tab %}
-{% data reusables.dotcom_billing.update_payment_method %}
-{% data reusables.billing.edit-billing-information %}
-{% data reusables.dotcom_billing.enter-billing-info %}
-{% data reusables.billing.edit-payment-method %}
-{% data reusables.dotcom_billing.enter-payment-info %}

content/billing/how-tos/manage-for-client/renew-client-organization.md

@@ -1,31 +0,0 @@
----
-title: Renewing your client's paid organization
-intro: 'If your client''s organization has a valid payment method on file, their yearly subscription will automatically renew. Billing managers can view and update the organization''s payment method and subscription.'
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/renewing-your-clients-paid-organization
-  - /articles/renewing-your-client-s-paid-organization
-  - /articles/renewing-your-clients-paid-organization
-  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
-  - /billing/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
-  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
-versions:
-  fpt: '*'
-  ghec: '*'
-topics:
-  - Billing
-  - Organizations
-shortTitle: Renew client organization
-contentType: how-tos
----
-{% data reusables.organizations.reseller-ask-to-become-billing-manager %}
-
-> [!TIP]
-> Billing managers can also [change the organization's number of paid seats](/billing/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization) anytime.
-
-## Updating your organization's credit card
-
-{% data reusables.organizations.billing-settings %}
-{% data reusables.dotcom_billing.update_payment_method_organization_account %}
-1. Under "Payment method", click **New Card**.
-![Screenshot of the "Payment method" section. Below some card details, a link, labeled "New Card", is highlighted with an orange outline.](/assets/images/help/billing/billing-new-card-button.png)
-{% data reusables.dotcom_billing.enter-payment-info %}

content/billing/how-tos/set-up-payment/manage-payment-info.md

@@ -4,6 +4,8 @@ intro: 'Learn how to view and manage your payment information and billing contac
 versions:
   feature: enhanced-billing-platform
 redirect_from:
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/renewing-your-clients-enterprise-account
+  - /billing/how-tos/manage-for-client/renew-client-enterprise
   - /billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information
   - /billing/using-the-billing-platform/adding-or-editing-a-payment-method
   - /billing/using-the-billing-platform/viewing-your-payment-history-and-receipts

data/reusables/dotcom_billing/add-seats.md

@@ -1,3 +1 @@
 1. Under "Current plan", next to the name of your plan, select **Edit** and click **Add seats**.
-
-   ![Screenshot of the "Current plan" section. Next to the plan name, in the "Edit" dropdown, the "Add seats" option is highlighted with an orange outline.](/assets/images/help/billing/add-seats-dropdown.png)

data/reusables/dotcom_billing/upgrade_org.md

@@ -1 +1 @@
-1. Click **Upgrade** next to "Current plan".
+1. Click **Upgrade to Team** next to "Current plan".

data/reusables/organizations/billing-settings.md

@@ -1,4 +1,4 @@
 {% data reusables.user-settings.access_settings %}
 1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-hidden="true" aria-label="organization" %} Organizations**.
 {% data reusables.profile.org_settings %}
-1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**.
+1. If you are an organization owner or billing manager, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**.