Billing and subscription FAQ updates (#19182)

* move faq content to main manuals

* add crosslink

* update wording

* implement feedback

* update callout

content/billing/cycle.md

@@ -9,7 +9,7 @@ You can pay for a Pro or Team subscription on a monthly or yearly billing cycle.
 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.
 
 When you change the billing cycle's duration:
-- 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 next billing date reflects the new cycle. To find your next billing date, see [View renewal date](history.md#view-renewal-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 you switch from a $10 monthly subscription to a $100 annual plan, deducting the unused monthly value (in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost after March 15, 2024 is $100.
 

content/billing/details.md

@@ -1,7 +1,7 @@
 ---
 title: Update the billing information
 description: Learn how to update your billing information in Docker Hub
-keywords: payments, billing, subscription
+keywords: payments, billing, subscription, invoices
 ---
 
 You can update the billing information for your personal account or for an organization. When you update your billing information, these changes apply to future billing invoices.
@@ -11,7 +11,7 @@ You can update the billing information for your personal account or for an organ
 > You can't update an existing invoice, including paid and unpaid invoices.
 { .important }
 
-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).
+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](#update-your-email-address-that-receives-billing-invoices).
 
 ## Personal account
 
@@ -34,4 +34,34 @@ The billing information provided appears on all your billing invoices. The email
 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**.
+7. Select **Save**.
+
+## Update your email address that receives billing invoices
+
+Docker sends the following billing-related emails:
+
+- Confirmation of a new subscription.
+- Confirmation of paid invoices.
+- Notifications of credit or debit card payment failures.
+- Notifications of credit or debit card expiration.
+- Confirmation of a cancelled subscription
+- Reminders of subscription renewals for annual subscribers. This is sent 14 days before the renewal date.
+
+You can update the email address that receives billing invoices at any time.
+
+### Personal account
+
+1. Select your avatar in the top-right corner of Docker Hub.
+2. From the drop-down menu select **Billing**.
+3. Select the **Payment methods and billing history** link.
+4. Select **Update information**, then enter your new email address.
+5. Select **Save**.
+
+### Organizations
+
+1. Select your avatar 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 and billing history** link.
+5. Select **Update information**, then enter your new email address.
+6. Select **Save**.

content/billing/faqs.md

@@ -4,15 +4,7 @@ description: Frequently asked questions related to billing
 keywords: billing, renewal, payments, faq
 ---
 
-### Where can I view my billing date?
-
-Sign in to Hub, then:
-
-1. Select your user avatar to open the drop-down menu.
-2. Select **Billing**.
-3. Select the user or organization account to view the billing details.
-
-Here you can find your renewal date near the bottom-right of your plan details.
+For more information on billing, see [Billing and payments](_index.md).
 
 ### What credit and debit cards are supported?
 
@@ -40,50 +32,6 @@ Docker also sends an email notification `Action Required - Credit Card Payment F
 
 Once the grace period is over and the invoice is still not paid, the subscription downgrades to a free plan and all paid features are disabled.
 
-### What information is included on my billing invoice?
-
-Your invoice includes the following:
-
-- Invoice number
-- Date of issue
-- Date due
-- Your bill to information
-- Amount due
-- Description of your order, quantity if applicable, unit price, and amount
-
-Amounts are in USD.
-
-The information listed in the Bill to section is based on your billing information. Not all fields are required. The billing information includes the following:
-
-- Name (required) - the name of the administrator or company.
-- Email address (required) - the email address that receives all billing-related emails for the account.
-- Address (required)
-- Phone number
-- Tax ID or VAT
-
-### How can I make changes to a billing invoice?
-
-You can’t make changes to a paid or unpaid billing invoice. When you update your billing information, this change won't update an existing invoice. If you need to update your billing information, make sure you do so before your subscription renewal date when your invoice is finalized. For more information, see [Update the billing information](details.md).
-
-### When during the billing cycle do I receive my invoice?
-
-You receive your invoice when the subscription renews. To verify your renewal date, sign in to Hub, then:
-
-1. Select your user avatar to open the drop-down menu.
-2. Select **Billing**.
-3. Select the user or organization account to view the billing details. Here you can find your renewal date and the renewal amount.
-
-### What billing-related emails will I receive from Docker Hub?
-
-Docker Hub sends the following billing-related emails:
-
-- Confirmation of a new subscription.
-- Confirmation of paid invoices. 
-- Notifications of credit or debit card payment failures. 
-- Notifications of credit or debit card expiration. 
-- Confirmation of a cancelled subscription 
-- Reminders of subscription renewals for annual subscribers. This is sent 14 days before the renewal date. 
-
 ### Does Docker offer academic pricing?
 
 Contact the [Docker Sales Team](https://www.docker.com/company/contact).
@@ -91,47 +39,3 @@ Contact the [Docker Sales Team](https://www.docker.com/company/contact).
 ### Do I need to do anything at the end of my subscription term?
 
 No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment.
-
-### How do I redeem a coupon?
-
-You can redeem a coupon for any paid Docker subscription. 
-
-A coupon can be used when you:
-- Sign up to a new paid subscription from a free subscription
-- Upgrade an existing paid subscription 
-
-You are asked to enter your coupon code when you confirm or enter your payment method. 
-
-If you use a coupon to pay for a subscription, when the coupon expires, your payment method is charged the full cost of your subscription. If you don't have a saved payment method, your account downgrades to a free subscription.
-
-### How do I include my VAT number on my invoice?
-
-Update your billing information to include your VAT number:
-
-1. Sign in to Docker Hub.
-2. For user accounts, Select your avatar in the top-right corner, then **Billing**. For organizations, select the name of the organization.
-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**.
-
-Your VAT number will be included on your next invoice.
-
-### How do I update the email that receives billing invoices?
-
-For user accounts:
-
-1. Select your avatar in the top-right corner of Docker Hub.
-2. From the drop-down menu select **Billing**.
-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 your avatar 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 and billing history** link.
-5. Select **Update information**, then enter your new email address.
-6. Select **Save**.

content/billing/history.md

@@ -1,12 +1,60 @@
 ---
 title: View billing history
 description: Discover how to view your billing history in Docker Hub
-keywords: payments, billing, subscription, invoices
+keywords: payments, billing, subscription, invoices, renewals, invoice management, billing administration
 ---
 
+In this section, learn how you can view your billing history, manage your invoices, and verify your renewal date. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment.
+
+## Invoices
+
+Your invoice includes the following:
+
+- Invoice number
+- Date of issue
+- Date due
+- Your bill to information
+- Amount due
+- Description of your order, quantity if applicable, unit price, and amount
+
+Amounts are in USD.
+
+The information listed in the Bill to section is based on your billing information. Not all fields are required. The billing information includes the following:
+
+- Name (required) - the name of the administrator or company.
+- Email address (required) - the email address that receives all billing-related emails for the account.
+- Address (required)
+- Phone number
+- Tax ID or VAT
+
+You can’t make changes to a paid or unpaid billing invoice. When you update your billing information, this change won't update an existing invoice. If you need to update your billing information, make sure you do so before your subscription renewal date when your invoice is finalized. For more information, see [Update the billing information](details.md).
+
+### View renewal date
+
+You receive your invoice when the subscription renews. To verify your renewal date, sign in to Hub, then:
+
+1. Select your user avatar to open the drop-down menu.
+2. Select **Billing**.
+3. Select the user or organization account to view the billing details. Here you can find your renewal date and the renewal amount.
+
+### Include your VAT number on your invoice
+
+Update your billing information to include your VAT number:
+
+1. Sign in to Docker Hub.
+2. For user accounts, Select your avatar in the top-right corner, then **Billing**. For organizations, select the name of the organization.
+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**.
+
+Your VAT number will be included on your next invoice.
+
+## View billing history
+
 You can view the billing history and download past invoices for a personal account or organization.
 
-## Personal account
+### Personal account
 
 1. Select your avatar in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
@@ -15,7 +63,7 @@ You can view the billing history and download past invoices for a personal accou
 
 From here you can download an invoice.
 
-## Organization
+### Organization
 
 > **Note**
 >

content/billing/payment-method.md

@@ -1,7 +1,7 @@
 ---
 title: Add or update a payment method
 description: Learn how to add or update a payment method in Docker Hub
-keywords: payments, billing, subscription
+keywords: payments, billing, subscription, supported payment methods, failed payments, coupons
 ---
 
 This page describes how to add or update a payment method for your personal account or for an organization. 
@@ -12,6 +12,18 @@ You can add a payment method or update your account's existing payment method at
 >
 > If you want to remove all payment methods, you must first downgrade your subscription to a free plan. See [Downgrade](../subscription/downgrade.md), for more information. 
 
+The following payment methods are supported:
+
+- Visa
+- MasterCard
+- American Express
+- Discover
+- JCB
+- Diners
+- UnionPay
+
+All currency, for example the amount listed on your billing invoice, is in United States dollar (USD).
+
 ## Personal account
 
 1. Select your avatar in the top-right corner of Docker Hub.
@@ -36,3 +48,27 @@ You can add a payment method or update your account's existing payment method at
 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**.
+
+## Failed payments
+
+If your subscription payment fails, there is a grace period of 15 days, including the due date. Docker retries to collect the payment 3 times using the following schedule:
+
+- 3 days after the due date
+- 5 days after the previous attempt
+- 7 days after the previous attempt
+
+Docker also sends an email notification `Action Required - Credit Card Payment Failed` with an attached unpaid invoice after each failed payment attempt. 
+
+Once the grace period is over and the invoice is still not paid, the subscription downgrades to a free plan and all paid features are disabled.
+
+## Redeem a coupon
+
+You can redeem a coupon for any paid Docker subscription.
+
+A coupon can be used when you:
+- Sign up to a new paid subscription from a free subscription
+- Upgrade an existing paid subscription
+
+You are asked to enter your coupon code when you confirm or enter your payment method.
+
+If you use a coupon to pay for a subscription, when the coupon expires, your payment method is charged the full cost of your subscription. If you don't have a saved payment method, your account downgrades to a free subscription.

content/subscription/add-seats.md

@@ -1,6 +1,6 @@
 ---
 description: Learn how to add seats to an existing subscription
-keywords: Docker, Docker Hub, subscription, update, add, seats
+keywords: Docker, Docker Hub, subscription, update, add, seats, pricing
 title: Add seats to your subscription
 aliases:
 - /docker-hub/billing/add-seats/
@@ -27,4 +27,8 @@ When you add seats to your subscription in the middle of your billing cycle, you
 5. Select **Purchase** to confirm. 
     The **Billing** tab displays the new number of seats. 
 
-6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../admin/organization/members.md#add-a-member-to-a-team).
+6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../admin/organization/members.md#add-a-member-to-a-team).
+
+## Volume pricing
+
+Docker offers volume pricing for Docker Business subscriptions starting at 25 seats. Contact the [Docker Sales Team](https://www.docker.com/pricing/contact-sales/) for more information.

content/subscription/details.md

@@ -1,12 +1,20 @@
 ---
 title: Docker subscriptions and features
 description: Learn about Docker subscription tiers and their features
-keywords: subscription, personal, pro, team, business, features
+keywords: subscription, personal, pro, team, business, features, docker core subscription, docker core
 ---
 
-You can do more with Docker with a Docker subscription, such as add collaborators, create scoped access tokens, and create private repositories. This page provides an overview of each subscription tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
+You can do more with Docker with a Docker Core subscription, such as add collaborators, create scoped access tokens, and create private repositories. This page provides an overview of each subscription tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
-You can also subscribe to Docker Scout. See [Docker Scout subscriptions and features](./scout-details.md).
+The following describes some of the key features included with your Docker Core subscription:
+
+![Docker Core subscription diagram](images/subscription-diagram.webp)
+
+3 Docker Scout-enabled repositories for advanced remote image analysis. You can purchase a Docker Scout subscription to enable more repositories. See [Docker Scout subscriptions and features](./scout-details.md).
+
+Docker Build Cloud minutes are also included. For more information, see [Docker Build Cloud subscriptions and features](./build-details.md).
+
+Docker maintains a [public roadmap](https://github.com/docker/roadmap) so subscribers can see what new features are in development, as well as request new capabilities.
 
 ## Docker Personal
 
@@ -76,4 +84,8 @@ A self-serve Docker Business subscription is where everything is set up by you.
 
 ### Sales-assisted
 
-A sales-assisted Docker Business subscription where everything is set up and managed by a dedicated Docker account manager.
+A sales-assisted Docker Business subscription where everything is set up and managed by a dedicated Docker account manager.
+
+### Support for subscriptions
+
+All Docker Pro, Team, and Business subscribers receive email support for their subscriptions. Additional premium support is available for Docker Business customers. [Contact sales](https://www.docker.com/pricing/contact-sales/) for more information about premium support programs.

content/subscription/downgrade.md

@@ -1,6 +1,6 @@
 ---
 description: Learn how to downgrade your Docker subscription
-keywords: Docker Hub, downgrade, subscription, Pro, Team, Free, pricing plan,
+keywords: Docker Hub, downgrade, subscription, Pro, Team, pricing plan, pause subscription
 title: Downgrade your subscription
 aliases:
 - /docker-hub/cancel-downgrade/
@@ -13,6 +13,11 @@ When you downgrade your subscription, access to paid features is available until
 
 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).
 
+> **Important**
+>
+> If you downgrade your personal account from a Pro subscription to a Personal subscription, note that [Personal subscriptions](details.md#docker-personal) don't include collaborators for private repositories, and only 1 private repository is included. When you downgrade, all collaborators will be removed and additional private repositories are locked.
+{ .important }
+
 ## Downgrade your Docker subscription
 
 >**Important**
@@ -35,4 +40,8 @@ Before you downgrade to a free subscription, you may need to reduce the number o
 7. Optional: Select a reason for your downgrade from the list and select **Send**.
     The **Billing** page displays a confirmation of the downgrade with details on when the downgrade changes take effect.
 
-If you want to cancel the downgrade, select **Cancel the downgrade** on the **Plan** tab.
+If you want to cancel the downgrade, select **Cancel the downgrade** on the **Plan** tab.
+
+## Pause a subscription
+
+You can't pause or delay a subscription. If a subscription invoice hasn't been paid on the due date, there's a 15 day grace period, including the due date.

content/subscription/faq.md

@@ -4,45 +4,15 @@ keywords: Docker, Docker Hub, subscription FAQs, subscription, platform
 title: Subscription FAQs
 ---
 
-### I want to buy a large number of Docker Business subscription seats. How do I do this? Can I get a discount?
-
-Docker offers volume pricing for Docker Business subscriptions starting at 25 seats. Contact the [Docker Sales Team](https://www.docker.com/pricing/contact-sales/) for more information.
-
-### How do I access support? What level of support do I get for my subscription?
-
-All Docker Pro, Team, and Business subscribers receive email support for their subscriptions. Additional premium support is available for Docker Business customers. [Contact sales](https://www.docker.com/pricing/contact-sales/) for more information about premium support programs.
-
-### Is Docker Scout included with my Docker Subscription?
-
-If you have a Docker subscription, you automatically have access to a Docker Scout Free subscription. This lets you enable Docker Scout on up to 3 repositories. To enable Docker Scout for additional repositories, you can [upgrade your plan](../billing/scout-billing.md).
-
-### Do I need to do anything at the end of my subscription term?
-
-No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment.
-
-### What happens if I pay for an annual subscription and add more seats later?
-
-When you add seats to your plan in the middle of your billing cycle, you're charged a prorated amount for the additional seats.
-
-### What happens to my collaborators when I move to a Personal subscription?
-
-Personal subscriptions don't include collaborators for private repositories. If you have collaborators when you move to a Personal subscription from a paid subscription you need to remove all collaborators. If you haven't removed collaborators within 30 days of moving to a free plan, all collaborators are automatically removed from your account.
-
-### How do I know what new features are in planning for my Docker Pro or Docker Team subscription?
-
-Docker maintains a [public roadmap](https://github.com/docker/roadmap) so subscribers can see what new features are in development, as well as request new capabilities.
-
-### Can I pause or delay my Docker subscription?
-
-You can't pause or delay a subscription. If a subscription invoice hasn't been paid on the due date, there's a 15 day grace period, including the due date.
+For more information on Docker subscriptions, see [Docker subscription overview](_index.md).
 
 ### Can I transfer my subscription from one user or organization account to another?
 
 Subscriptions are non-transferable.
 
-### I have more questions regarding pricing, who can I reach out to?
+### Can I pause or delay my Docker subscription?
 
-If you have any questions that aren't covered here, [reach out](https://www.docker.com/company/contact) and a member of the Docker team will get back to you.
+You can't pause or delay a subscription, but you can [downgrade](downgrade.md). If a subscription invoice hasn't been paid on the due date, there's a 15 day grace period, including the due date.
 
 ### Does Docker offer academic pricing?