Merge pull request #13501 from docker/master

Publish updates from master
This commit is contained in:
Usha Mandya 2021-09-10 18:30:19 +01:00 committed by GitHub
commit 170c0759bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 57 additions and 119 deletions

View File

@ -6,7 +6,7 @@ horizontalnav:
- title: Guides
path: /get-started/overview/
node: guides
- title: Product manuals
- title: Manuals
path: /desktop/
node: manuals
- title: Reference

View File

@ -6,7 +6,7 @@ page's location in the TOC (_data/toc.yaml). To get the "parent" TOC entries
for the current page, we:
- iterate through each of the main sections / categories in the TOC (home, guides,
product manuals, reference, samples)
manuals, reference, samples)
- in each section, we iterate throught pages and sections. "sections" do not
have URLs ("path") of their own, but can contain pages and sub-sections.
Liquid doesn't allow us to "recursively" iterate through these, so we added

View File

@ -94,7 +94,7 @@
</div>
<div class="col-xs-12 col-sm-6 col-lg-4 card-holder">
<a class="card manuals" href="/desktop/">
<h5 class="title">Product manuals</h5>
<h5 class="title">Manuals</h5>
<p>
Browse through the manuals and learn how to use Docker products.
</p>

View File

@ -54,7 +54,7 @@ services:
devices:
- driver: nvidia
count: 1
capabilities: [gpu, utility]
capabilities: [gpu]
```
Run with Docker Compose:

View File

@ -118,7 +118,7 @@ It gives you quick access to container logs, lets you get a shell inside the con
easily manage container lifecycle (stop, remove, etc.).
To access the dashboard, follow the instructions in the
[Docker Desktop product manual](../desktop/dashboard.md). If you open the dashboard
[Docker Desktop manual](../desktop/dashboard.md). If you open the dashboard
now, you will see this tutorial running! The container name (`jolly_bouman` below) is a
randomly created name. So, you'll most likely have a different name.

View File

@ -6,7 +6,7 @@ title: Docker release notes
Find out what's new in Docker! Release notes contain information about new
features, improvements, known issues, and bug fixes in each release. You can
find release notes for each component in the product manuals section. We suggest
find release notes for each component in the Manuals section. We suggest
that you regularly visit the release notes to learn about updates.
- [Docker Engine](../engine/release-notes/index.md)

View File

@ -91,7 +91,7 @@ on your development host. Use the following command to bind-mount the `target/`
directory into your container at `/app/`. Run the command from within the
`source` directory. The `$(pwd)` sub-command expands to the current working
directory on Linux or macOS hosts.
If you're on Windows, see also [Path conversions on Windows](../docker-for-windows/troubleshoot.md#path-conversions-on-windows)
If you're on Windows, see also [Path conversions on Windows](../desktop/windows/troubleshoot.md#path-conversion-on-windows).
The `--mount` and `-v` examples below produce the same result. You
can't run them both unless you remove the `devtest` container after running the

View File

@ -7,174 +7,112 @@ redirect_from:
- /docker-hub/billing/upgrade/
---
This page contains information on how to purchase a Docker paid subscription. It also contains information on how to upgrade your existing subscription and update your billing information.
This page contains information on how to purchase a Docker paid subscription. It also contains information on how to upgrade your existing subscription and update your billing information.
You can upgrade to a Docker Pro, Team, or a Business subscription from a Personal subscription. When you upgrade to a paid subscription, you can immediately use all the features and entitlements offered in your new subscription. For detailed information on features available in each subscription, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
## Purchase Docker Pro
## Purchase a Docker subscription
The following section contains information on how to purchase a Docker Pro subscription for new customers.
The following section contains information on how to purchase a Docker subscription for new customers.
To purchase Docker Pro:
To purchase a Docker 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** to go to the **Billing Details** page. This 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.
> **Note**
>
> Ensure you have selected the correct account on the left side of the
**Billing Details** page. For example, if you want to purchase a Docker
Pro subscription, you must select your personal account.
4. Click **Change plan**.
3. Click **Change plan** and navigate to the pricing page to purchase a subscription and follow the on-screen instructions to purchase.
5. The Docker Hub **Pricing** page displays information about the new subscription. Review the subscription details in the **Pro** section and click **Upgrade Now**.
> **Note**
>
> You can select from the following options: Pro, Team, or Business
subscription. The annual subscription is set by default. Select **Pay
Monthly** to change to a monthly subscription.
5. The **Payment Method** page displays the cost for the annual subscription by default. If you prefer to opt for the monthly subscription, choose **Pay Monthly**.
4. If you are purchasing a Team subscription, provide the organization details and click **Continue to Org Size**. Review your Team subscription and click **Continue to Payment**.
6. Enter the card details and click **Purchase**.
You can also specify the number of users youd like to add to your
organization.
7. Verify your email address.
5. You will receive an email confirming your subscription.
8. Open the drop-down menu next to your username in the top-right corner and select **Billing**.
6. Open the drop-down menu next to your username in the top-right corner and select **Billing**.
The **Billing** page displays information about your new subscription and the total cost.
## Purchase Docker Team
The following section contains information on how to purchase a Docker Team subscription for new organizations. If you do not have a team yet, see [create a team](../docker-hub/orgs.md#create-a-team) for instructions on how to create a new team.
To purchase Docker Team:
1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account.
2. Click **Organizations** in the toolbar and select your organization.
3. Click the **Billing** tab and click **Change plan**.
The Docker Hub **Pricing** page displays information about the new subscription.
4. Review the subscription details in the **Team** section and click **Buy Now**.
5. Enter a name for your new organization and add a company name.
6. The **Organization size** page displays the cost for the annual subscription by default. If you prefer to change this, select **Pay Monthly**.
7. Specify the number of users youd like to add to your organization and click **Continue to Payment**.
8. On the **Payment Method** page, enter the card details and click **Purchase**.
9. Verify your email address.
10. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Docker Team subscription and the total cost.
You can view the information about your new subscription on the
**Billing** page.
## Purchase Docker Business
The Docker Business subscription is currently available to purchase through the Docker Sales team. To purchase a Docker Business subscription, [Contact Sales](https://www.docker.com/pricing/contact-sales){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.
## Upgrade to Docker Pro
## Upgrade your subscription
To upgrade to Docker Pro:
To upgrade to a Pro or Team:
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.
>**Note**
>
> Ensure you have selected your personal account or organization on the
left side of the **Billing Details** page. For example, if you want to upgrade to a Docker Pro subscription, you must select your personal account.
![Billing details personal account](images/billing-personal-account.png){:width="750px"}
4. Click **Change plan** to choose a new subscription.
3. Click **Change plan** and navigate the pricing page to upgrade your subscription and continue with the on-screen instructions.
5. Review the details in the **Pro** section and click **Buy Now**.
You can select from the following options: Pro, Team, or Business subscription.
6. By default, the **Payment Method** page displays the annual cost to upgrade to Docker Pro. If you prefer to upgrade to a monthly subscription, choose **pay monthly**.
4. When upgrading to a Team subscription, provide the organization details and click **Continue to Org Size**. Review your Team subscription and click **Continue to Payment**.
7. Review the card details and the information displayed and click **Purchase** to confirm.
> **Note**
>
> You can also specify the number of users youd like to add to your organization. On the **Organization size** page, the cost for the annual subscription is set by default. If you prefer to change this, select **Pay Monthly**.
The **Billing** page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost.
5. Youll also receive an email confirming your new subscription.
8. Youll also receive an email confirming the cancellation of your legacy subscription.
6. Open the drop-down menu next to your username in the top-right corner and select **Billing**.
## Upgrade to Docker Team
To upgrade to Docker Team subscription:
1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}.
2. Navigate to **Organizations** from the menu at the top of the page, then choose your organization.
3. Select the **Billing** tab.
4. Click **Change plan** to upgrade to a new subscription.
5. Review the details in the **Team** section and click **Buy Now**.
6. By default, the subscription displays the annual cost to upgrade the existing number of users to a Docker Team subscription. To switch to a monthly subscription, click **Pay Monthly**.
7. Review and adjust the number of users as required and click **Continue to payment**.
8. Review the card details and click **Purchase** to confirm.
The **Billing page** now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost.
Youll also receive an email confirming the cancellation of your legacy subscription.
You can view the information about your new subscription and the total cost
on the **Billing** page.
## Upgrade to Docker Business
To upgrade to a Docker Business subscription, [Contact Sales](https://www.docker.com/pricing/contact-sales){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.
## Upgrade from a monthly Team to an annual subscription
## Upgrade from a monthly subscription to an annual subscription
To upgrade from a monthly Team subscription to an annual Team subscription:
To upgrade from a monthly subscription to an annual subscription:
1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}.
2. Navigate to **Organizations** from the menu at the top of the page, choose your organization, and select the **Billing** tab.
3. Click **switch to annual billing**.
4. Review the information displayed on the **Change to an Annual subscription** page and click **Accept Terms and Purchase** to confirm.
The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost.
## Upgrade from a monthly Pro to an annual subscription
To upgrade from a monthly Pro subscription to an annual Pro 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** to go to the **Billing Details** page. This 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.
1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account as an organization owner or with your personal account.
2. Open the drop-down menu next to your username in the top-right corner and select **Billing**.
3. Select your personal account or organization from the left-hand menu and select the **Payment Methods** tab.
4. Click **switch to annual billing**.
5. Review the information displayed on the **Change to an Annual subscription** page and click **Accept Terms and Purchase** to confirm.
The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost.
You can view the confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost on the **Billing** page.
## Update billing information
> **Note**
>
> You must be on owner of the organization to make changes to the billing information.
You must be on owner of the organization to make changes to the billing information.
To update the billing information for your organization:
To update the billing information for your organization or personal account:
1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}.
1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account as an organization owner or with your personal account.
2. Select **Organizations** from the menu at the top of the page. This displays a list of organizations.
2. Open the drop-down menu next to your username in the top-right corner and select **Billing**.
3. Choose the organization from the list and select the **Billing** tab.
4. Select **Payment Methods**.
5. The **Payment Information** page displays your existing billing information and allows you to edit the details.
3. Select your personal account or organization from the left-hand menu, select the **Payment Methods** tab, and continue with the on-screen instructions.
> **Note**
>
> The details displayed in the **Contact Information** section is used to generate your invoice. All billing-related information is sent to the email address listed in this section.
6. Change the details as required and then click **Update** to save your changes.
To update the billing information for your user account:
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 page displays billing information about your existing user account.
3. Select **Payment Methods**.
4. The **Payment Information** page displays your existing billing information and allows you to edit the details.
5. Click **Update** to save your changes.
4. Click **Update** to save your changes.