Billing and subscription updates (#18589)

* remove banners and update steps

* update wording

* update list

* clarify steps

* update seats and fix list

* fix capitalization and align wording

content/billing/cycle.md

@@ -4,35 +4,12 @@ description: Learn to change your billing cycle for your Docker subscription
 keywords: billing, cycle, payments, subscription
 ---
 
-> **Early access features**
->
-> If you're subscribed to Docker Pro or subscribed to Docker Team or Business after October 23, 2023, you can't change the billing cycle from monthly to annual.
-{ .restricted }
+You can pay for a Pro or Team subscription on a monthly or yearly billing cycle. You select your preferred billing cycle when you buy your subscription.
 
-You can pay for a Pro or Team subscription on a monthly or yearly billing cycle.
+You can't change the billing cycle from monthly to annual, or from annually to monthly.
 
-If you have a monthly billing cycle, you can choose to switch to an annual billing cycle. Note that it's not possible to switch from an annual billing cycle to monthly.
+For questions about your billing cycle, [contact support](https://hub.docker.com/support/contact/).
 
-When you change the billing cycle's duration:
+## More resources
 
-- The next billing date reflects the new cycle. To check the billing date, see [FAQs](faqs.md#where-can-i-view-my-billing-date).
-- The subscription's start date resets. For example, if the start date of the monthly subscription is March 1st and the end date is April 1st, then after switching the billing duration to March 15th 2023 the new start date is March 15th, 2023, and the new end date is March 15th, 2024.
-- Any unused monthly subscription is prorated and applied as credit towards the new annual period. For example, if the monthly subscription cost is $10 per month and the annual cost is $100 per year, then the unused value of the monthly subscription is $5. The migration cost would be $95 ($100 - $5). The renewal cost after March 15, 2024 is $100.
-
-## Personal account
-
-1. Select your username in the top-right corner of Docker Hub.
-2. From the drop-down menu select **Billing**.
-3. In the bottom-right of the **Plan** tab, select **Switch to annual billing**.
-4. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm.
-
-## Organization 
-
-> **Note**
->
-> You must be an organization owner to make changes to the payment information.
-
-1. In Docker Hub, select **Organizations**.
-2. Select the organization that you want to change the payment method for. 
-3. In the bottom-right of the **Plan** tab, select **Switch to annual billing**. 
-4. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm.
+[Billing FAQs](faqs.md)

content/billing/details.md

@@ -4,11 +4,6 @@ description: Learn how to update your billing information in Docker Hub
 keywords: payments, billing, subscription
 ---
 
-> **Early access features**
->
-> If you're subscribed to Docker Pro or subscribed to Docker Team or Business after October 23, 2023, you may have a different user interface experience. To update your billing information, go to the **Billing** page for your account, then select the **Payment methods and billing history** link.
-{ .restricted }
-
 You can update the billing information for your personal account or for an organization. 
 
 The billing information provided appears on all your billing invoices. The email address provided is where Docker sends all invoices and other billing-related communication. For more information on the billing emails you receive, see [FAQs](faqs.md#what-billing-related-emails-will-i-receive-from-docker-hub).
@@ -17,9 +12,10 @@ The billing information provided appears on all your billing invoices. The email
 
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
-3. Select the **Payment Methods** tab. 
-4. In the **Billing Information** section, enter your updated billing details. 
-5. Select **Update**. 
+3. Select the **Payment methods and billing history** link.
+4. In the **Billing Information** section, select **Update information**.
+5. Enter your updated billing details.
+6. Select **Save**. 
 
 ## Organization 
 
@@ -29,7 +25,8 @@ The billing information provided appears on all your billing invoices. The email
 
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
-3. Select the organization that you want to change the payment method for. 
-4. Select the **Payment Methods** tab.
-5. In the **Billing Information** section, enter your updated billing details. 
-6. Select **Update**.
+3. Select the organization that you want to change the payment method for.
+4. Select the **Payment methods and billing history** link.
+5. In the **Billing Information** section, select **Update information**.
+6. Enter your updated billing details.
+7. Select **Save**.

content/billing/faqs.md

@@ -4,11 +4,6 @@ description: Common FAQs related to billing
 keywords: billing, renewal, payments
 ---
 
-> **Early access features**
->
-> If you're subscribed to Docker Pro or subscribed to Docker Team or Business after October 23, 2023, you may have a different user interface experience. To find past invoices and update payment and billing information, go to the **Billing** page for your account, then select the **Payment methods and billing history** link.
-{ .restricted }
-
 ### Where can I view my billing date?
 
 Navigate to the **Plan** tab in your billing settings. The billing date is located near the bottom-right.
@@ -72,13 +67,12 @@ Update your billing information to include your VAT number:
 
 1. Sign in to Docker Hub.
 2. For user accounts, Select your username in the top-right corner, then **Billing**. For organizations, select the name of the organization.
-3. Select **Payment Methods**.
-4. In the **Billing Information** section, enter your information in the **VAT/Tax ID** field.
-5. Select **Update**.
+3. Select the **Payment methods and billing history** link.
+4. In the **Billing Information** section, select **Update information**.
+5. In the **Tax ID** section, select the ID type and enter your VAT number.
+6. Select **Save**.
 
-To download your updated invoice:
-1. Go to **Billing History**, select the **Actions** icon, and then select **Update invoice**.
-2. Select **Update and download** to download the invoice that includes the VAT number.
+Your VAT number will be included on your next invoice.
 
 ### How do I update the email that receives billing invoices?
 
@@ -86,13 +80,15 @@ For user accounts:
 
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
-3. Select the **Payment Methods** tab, then update the email field in the **Billing Information** section.
-4. Select **Update**.
+3. Select the **Payment methods and billing history** link.
+4. Select **Update information**, then enter your new email address.
+5. Select **Save**.
 
 For organizations:
 
 1. Select you username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
 3. Select the name of the organization.
-4. Select the **Payment Methods** tab, then update the email field in the **Billing Information** section.
-5. Select **Update**.
+4. Select the **Payment methods and billing history** link.
+5. Select **Update information**, then enter your new email address.
+6. Select **Save**.

content/billing/history.md

@@ -4,27 +4,18 @@ description: Discover how to view your billing history in Docker Hub
 keywords: payments, billing, subscription, invoices
 ---
 
-> **Early access features**
->
-> If you're subscribed to Docker Pro or subscribed to Docker Team or Business after October 23, 2023, you may have a different user interface experience. To view your billing history and past invoices, go to the **Billing** page for your account, then select the **Payment methods and billing history** link.
-{ .restricted }
-
 You can view the billing history and download past invoices for a personal account or organization at any time.
 
 ## Personal account
 
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
-3. Select the **Billing History** tab.
-    This page lists past invoices. 
+3. Select the **Payment methods and billing history** link.
+    You can find your past invoices in the **Invoice History** section.
 
-From here you can choose to:
-- Download an invoice.
-- Update an invoice with recently [updated billing information](details.md) by selecting the actions icon and then **Update Invoice**. 
+From here you can download an invoice.
 
-
-
-## Organization 
+## Organization
 
 > **Note**
 >
@@ -33,9 +24,7 @@ From here you can choose to:
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
 3. Select the organization that you want to change the payment method for. 
-4. Select the **Billing History** tab.
-    This page lists past invoices. 
+4. Select the **Payment methods and billing history** link.
+    You can find your past invoices in the **Invoice History** section.
 
-From here you can choose to:
-- Download an invoice.
-- Update an invoice with recently [updated billing information](details.md) by selecting the actions icon and then **Update Invoice**.
+From here you can download an invoice.

content/billing/payment-method.md

@@ -4,11 +4,6 @@ description: Learn how to add or update a payment method in Docker Hub
 keywords: payments, billing, subscription
 ---
 
-> **Early access features**
->
-> If you're subscribed to Docker Pro or subscribed to Docker Team or Business after October 23, 2023, you may have a different user interface experience. To add or update a payment method, go to the **Billing** page for your account, then select the **Payment methods and billing history** link.
-{ .restricted }
-
 This page describes how to add or update a payment method for your personal account or for an organization. 
 
 You can add a payment method or update your account's existing payment method at any time.
@@ -21,11 +16,11 @@ You can add a payment method or update your account's existing payment method at
 
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
-3. Select the **Payment Methods** tab. 
-4. In the **Payment information** section, enter the new payment method. 
-    The screen refreshes and displays your new payment information alongside your existing information.
-5. Select **Make Default** to ensure that your new payment method applies to all purchases and subscriptions. 
-6. Optional. Remove your existing payment method by selecting the **X** icon.
+3. Select the **Payment methods and billing history** link.
+4. In the **Payment Method** section, select **Add payment method**.
+5. Enter your new payment information, then select **Add**.
+6. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
+7. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.
 
 ## Organization 
 
@@ -36,8 +31,8 @@ You can add a payment method or update your account's existing payment method at
 1. Select your username in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**. 
 3. Select the organization account you want to update.
-4. Select the **Payment Methods** tab.
-5. In the **Payment Information** section, enter the new payment method. 
-    The screen refreshes and displays your new payment information alongside your existing information.
-6. Select **Make Default** to ensure that your new payment method applies to all purchases and subscriptions. 
-7. Optional. Remove your existing payment method by selecting the **X** icon.
+4. Select the **Payment methods and billing history** link.
+5. In the **Payment Method** section, select **Add payment method**.
+6. Enter your new payment information, then select **Add**.
+7. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
+8. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.

content/subscription/downgrade.md

@@ -7,14 +7,9 @@ aliases:
 - /docker-hub/billing/downgrade/
 ---
 
-> **Early access features**
->
-> If you're subscribed to Docker Pro or subscribed to Docker Team or Business after October 23, 2023, you may have a different downgrade experience. When you downgrade these subscriptions, changes don't apply immediately and access to paid features is available until the next billing cycle. View the **Billing** details for your account to verify.
-{ .restricted }
-
 You can downgrade your Docker subscription at anytime before the renewal date. The unused portion of the subscription isn't refundable or creditable.
 
-When you downgrade your subscription, changes apply immediately and you no longer have access to prior services.
+When you downgrade your subscription, access to paid features is available until the next billing cycle. The downgrade takes effect on the next billing cycle.
 
 Before you downgrade to a free subscription, you may need to reduce the number of team members and convert any private repositories to public repositories or delete them. For information, see [Docker Pricing](https://www.docker.com/pricing).
 
@@ -31,7 +26,7 @@ Before you downgrade to a free subscription, you may need to reduce the number o
 
 3. Choose either your personal account or an organization to downgrade. 
 
-4. On the **Plan** tab, select **Change plan**.
+4. In the **Plan** section, select **Change plan**.
 
 5. On the **Change Plan** page, select the plan you'd like to downgrade to. 
 

content/subscription/remove-seats.md

@@ -8,9 +8,9 @@ aliases:
 
 You can remove seats from your Team or Business subscription at anytime. 
 
-If you remove seats in the middle of the billing cycle, changes apply immediately and reflect in the next billing cycle. Any unused portion of the subscription for removed seats isn't refundable or creditable.
+If you remove seats in the middle of the billing cycle, changes apply in the next billing cycle. Any unused portion of the subscription for removed seats isn't refundable or creditable.
 
-For example, if you receive your billing on the 8th of every month for 10 seats and you want to remove 2 seats on the 15th of the month, the 2 seats are removed immediately. Your payment for 8 seats begins the next month. If you are on the annual subscription, the 2 seats are removed immediately, and your payment for the 8 seats begins next year.
+For example, if you receive your billing on the 8th of every month for 10 seats and you want to remove 2 seats on the 15th of the month, the 2 seats will be removed from your subscription the next month. Your payment for 8 seats begins on the next billing cycle. If you're on the annual subscription, the 2 seats are still available until the next year, and your payment for the 8 seats begins on the next billing cycle.
 
 ## Remove seats from a monthly or an annual subscription
 
@@ -29,4 +29,4 @@ For example, if you receive your billing on the 8th of every month for 10 seats
 
 5. The **Billing** tab confirms the seat removal and the details on when the changes take effect.
 
-To cancel the removal of seats, select **Cancel seats downgrade**.
+To cancel the removal of seats, [contact support](https://hub.docker.com/support/contact/).

content/subscription/upgrade.md

@@ -15,9 +15,11 @@ When you upgrade to a paid subscription, you immediately have access to all the
 
 2. Optional: If you're upgrading from a free user account to a Team or Business subscription and want to keep your account name, [convert your user account into an organization](../docker-hub/convert-account.md).
 
-3. From the **Billing** section, select the **Plan** tab.
+3. Select your username in the top-right corner of Docker Hub.
 
-4. Select **Change plan** and then choose the plan you'd like to upgrade to. 
+4. From the drop-down menu select **Billing**, then the account you want to upgrade.
+
+5. In the **Plan** section, select **Change plan** and then choose the plan you'd like to upgrade to.
 
     >**Note**
     >
@@ -25,6 +27,6 @@ When you upgrade to a paid subscription, you immediately have access to all the
     >- An annual Team subscription to an annual Business subscription, the start date and end date of your subscription remains unchanged. Any unused subscription is prorated and applied as credit towards the new annual period of the Business subscription.
     >- A monthly Team subscription to an annual Business subscription, the start date is reset. Any unused subscription is prorated and applied as credit towards the new annual period of the Business subscription.
 
-5. Follow the on-screen instructions.
+6. Follow the on-screen instructions.
 
     If you have a [coupon](../billing/faqs.md#how-do-i-redeem-a-coupon) to use, you can enter it during this step.