docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13586 from docker/master 

Publish updates from master
This commit is contained in:
Usha Mandya 2021-09-22 18:44:32 +01:00 committed by GitHub
parent 68b2064344 401c940a80
commit 4cea1c3271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -1,4 +1,3 @@
version: "3.7"
services:
docs:
# By default, docker-compose up --build builds docs for a development

32
subscription/add-seats.md
View File

@ -6,17 +6,8 @@ redirect_from:
- /docker-hub/billing/add-seats/
---
You add seats anytime to your existing subscription.
## Add seats to a monthly subscription
> **Note:**
>
>- A monthly subscription includes monthly seats only.
>- You must be a member of the ‘owners’ team to add seats to your organization.
>- When you add seats to your monthly subscription in the middle of your billing cycle, you are charged a prorated amount for the additional seats.
To add seats to a monthly subscription:
You can add seats anytime to your existing subscription,
to add seats to a subscription:
1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account.
@ -30,23 +21,8 @@ To add seats to a monthly subscription:
6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../docker-hub/orgs.md#add-a-member-to-a-team).
## Add seats to an annual subscription
> **Note:**
>
> - An annual subscription includes annual seats only.
>- When you add a monthly or annual subscription, it includes seats for that subscription only.
>- For a monthly subscription, you must be a member of the ‘owners’ team to add seats to your organization.
>- When you add seats to your subscription in the middle of your billing cycle, you are charged a prorated amount for the additional seats.
To add annual seats to an annual subscription:
1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account.
2. Navigate to **Organizations** from the menu at the top of the page and select your organization.
3. Select the **Billing** tab and click **Add seats**.
4. Specify the number of seats you’d want to add and click **Purchase**.
5. The **Billing** tab displays the number of seats currently in use.
6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../docker-hub/orgs.md#add-a-member-to-a-team).

58
subscription/downgrade.md
View File

@ -11,64 +11,32 @@ You can downgrade your Docker subscription anytime. When you downgrade your subs
For example, if you are currently on a **Docker Team** subscription which is billed on the 8th of every month and you choose to downgrade to **Docker Personal** on the 15th, your plan will be active until 7th of the following month. You will be transferred to Docker Personal on the 8th of the following month.
The following sections contain instructions on how to downgrade from a paid subscription to a Docker Personal tier.
The following sections contain instructions on how to downgrade your existing Docker subscription.
## Downgrade from Docker Pro to Docker Personal
## Downgrade your Docker subscription
>**Note:**
>
> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn't expired.
> - Before you downgrade to Docker Personal, ensure that your account details are updated to reflect features available in Docker Personal. For example, you may need to convert any private repositories to public repositories. For information on what’s included in the Docker Personal, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn’t expired.
> - Before you downgrade to a Personal or a Free Team subscription, you must convert all private repositories to public repositories and update the organization details to reflect features available in Docker Personal or Free Team. For example, if you have a Docker Team subscription, you may need to reduce the number of team members. For information on what’s included in the subscription, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
{: .important }
To downgrade from a Docker Pro to Docker Personal:
To downgrade your subscription:
1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account.
2. Open the drop-down menu next to your username in the top-right corner and select **Billing**. The **Billing Details** page displays billing information about your existing user account.
3. Ensure you have selected your personal account on the left side of the **Billing Details** page.
4. Click **Change plan** to downgrade your existing subscription.
5. On the **Change Plan** page, review the information displayed in the **Free** section and click **Downgrade**.
6. When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**.
7. If your account meets the requirements of Docker Personal, the **Downgrade confirmation** screen will be displayed. Click **continue**.
8. We’d like to understand the reason for your downgrade. Select a reason for your downgrade from the list. Optionally, add a comment and select the checkbox to discuss your feedback with a member of the Docker team. Click **Send**.
9. The **Billing** page displays a confirmation of the downgrade with details on when the downgrade changes will take effect.
10. To cancel the downgrade, click **Cancel the downgrade**.
## Downgrade from Docker Team to Docker Free Team
>**Note:**
>
> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn't expired.
> - Before you downgrade to a Free Team, you must convert all private repositories to public repositories and update the organization details to reflect features available in the Free Team. For example, you may need to reduce the number of team members. For information on what’s included in the Free Team, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
{: .important }
>Ensure you have selected your Personal or Free team account on the left side of the **Billing Details** page.
To downgrade to a Docker Free Team from Docker Team:
3. On the **Change Plan** page, review the information displayed in the **Free** section and click **Downgrade**.
>**Note:**
>
>When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**. If your account meets the requirements, the **Downgrade confirmation** screen will appear.
1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}.
4. Select a reason for your downgrade from the list and click **Send**.
2. Navigate to **Organizations** from the menu at the top of the page, then choose your organization.
5. The **Billing** page displays a confirmation of the downgrade with details on when the downgrade changes will take effect.
3. Select the **Billing** tab.
4. Click **Change plan** to downgrade your existing plan.
5. On the **Change organization** page, review the information displayed in the **Free Team** section and click **Downgrade**.
6. When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**.
7. If your account meets the requirements of a Free Team plan, the **Downgrade confirmation** screen will be displayed. Click **continue**.
8. We’d like to understand the reason for your downgrade. Select a reason for your downgrade from the list. Optionally, add a comment and select the checkbox to discuss your feedback with a member of the Docker team. Click **Send**.
9. The **Billing** page displays a confirmation of the downgrade with details on when the downgrade changes will take effect.
10. To cancel the downgrade, click **Cancel the downgrade**.
6. To cancel the downgrade, click **Cancel the downgrade**.