mirror of https://github.com/docker/docs.git
change location of desktop note (#16696)
* change location of desktop note * adjust tone * adjust tone
This commit is contained in:
parent
7ea8454215
commit
eb56f32540
|
@ -10,12 +10,6 @@ redirect_from:
|
|||
- /docker-for-windows/opensource/
|
||||
---
|
||||
|
||||
> **Docker Desktop terms**
|
||||
>
|
||||
> Commercial use of Docker Desktop in larger enterprises (more than 250
|
||||
> employees OR more than $10 million USD in annual revenue) requires a paid
|
||||
> subscription.
|
||||
|
||||
Docker Desktop is a one-click-install application for your Mac, Linux, or Windows environment
|
||||
that enables you to build and share containerized applications and microservices.
|
||||
|
||||
|
|
|
@ -5,11 +5,8 @@ title: Install Docker Desktop on Linux
|
|||
redirect_from:
|
||||
- /desktop/linux/install/
|
||||
---
|
||||
> **Docker Desktop terms**
|
||||
>
|
||||
> Commercial use of Docker Desktop in larger enterprises (more than 250
|
||||
> employees OR more than $10 million USD in annual revenue) requires a paid
|
||||
> subscription.
|
||||
|
||||
This page contains information about general system requirements, supported platforms, and instructions on how to install Docker Desktop for Linux.
|
||||
|
||||
>Important
|
||||
>
|
||||
|
@ -20,8 +17,6 @@ redirect_from:
|
|||
>For more information see [What is the difference between Docker Desktop for Linux and Docker Engine](../faqs/linuxfaqs.md#what-is-the-difference-between-docker-desktop-for-linux-and-docker-engine).
|
||||
{: .important}
|
||||
|
||||
This page contains information about general system requirements, supported platforms, and instructions on how to install Docker Desktop for Linux.
|
||||
|
||||
## System requirements
|
||||
|
||||
To install Docker Desktop successfully, your Linux host must meet the following general requirements:
|
||||
|
@ -57,9 +52,7 @@ and architectures:
|
|||
| [Fedora](fedora.md) | [{{ yes }}](fedora.md) |
|
||||
|
||||
|
||||
> **Note:**
|
||||
>
|
||||
> An experimental package is available for [Arch](archlinux.md)-based distributions. Docker has not tested or verified the installation.
|
||||
An experimental package is available for [Arch](archlinux.md)-based distributions. Docker has not tested or verified the installation.
|
||||
|
||||
Docker supports Docker Desktop on the current LTS release of the aforementioned distributions and the most recent version. As new versions are made available, Docker stops supporting the oldest version and supports the newest version.
|
||||
|
||||
|
@ -119,9 +112,13 @@ Log out and log back in so that your group membership is re-evaluated.
|
|||
|
||||
## Generic installation steps
|
||||
|
||||
>Important
|
||||
> **Docker Desktop terms**
|
||||
>
|
||||
>Make sure you meet the system requirements outlined earlier and follow the distro-specific prerequisites.
|
||||
> Commercial use of Docker Desktop in larger enterprises (more than 250
|
||||
> employees OR more than $10 million USD in annual revenue) requires a paid
|
||||
> subscription.
|
||||
|
||||
Make sure you meet the system requirements outlined earlier and follow the distro-specific prerequisites.
|
||||
{: .important}
|
||||
|
||||
1. Download the correct package for your Linux distribution and install it with the corresponding package manager.
|
||||
|
@ -138,12 +135,9 @@ Log out and log back in so that your group membership is re-evaluated.
|
|||
|
||||
4. Select **Accept** to continue. Docker Desktop starts after you accept the terms.
|
||||
|
||||
> **Important**
|
||||
>
|
||||
> If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
{: .important}
|
||||
Note that Docker Desktop will not run if you do not agree to the terms. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
|
||||
For more information, see [Docker Desktop Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){:target="_blank" rel="noopener" class="_"}. We recommend that you also read the [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"}.
|
||||
For more information, see [Docker Desktop Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){:target="_blank" rel="noopener" class="_"}. We recommend that you also read the [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"}.
|
||||
|
||||
|
||||
## Where to go next
|
||||
|
|
|
@ -12,19 +12,19 @@ redirect_from:
|
|||
- /desktop/mac/apple-silicon/
|
||||
---
|
||||
|
||||
This page contains information about system requirements, download URLs, and instructions on how to install Docker Desktop for Mac.
|
||||
|
||||
[Docker Desktop for Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn }
|
||||
[Docker Desktop for Mac with Apple silicon](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
|
||||
|
||||
*For checksums, see [Release notes](../release-notes.md).*
|
||||
|
||||
> **Docker Desktop terms**
|
||||
>
|
||||
> Commercial use of Docker Desktop in larger enterprises (more than 250
|
||||
> employees OR more than $10 million USD in annual revenue) requires a paid
|
||||
> subscription.
|
||||
|
||||
This page contains information about system requirements, download URLs, and instructions on how to install Docker Desktop for Mac.
|
||||
|
||||
[Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn }
|
||||
[Mac with Apple silicon](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
|
||||
|
||||
*For checksums, see [Release notes](../release-notes.md).*
|
||||
|
||||
## System requirements
|
||||
|
||||
Your Mac must meet the following requirements to install Docker Desktop successfully.
|
||||
|
@ -80,12 +80,9 @@ Your Mac must meet the following requirements to install Docker Desktop successf
|
|||
|
||||
4. Select **Accept** to continue. Docker Desktop starts after you accept the terms.
|
||||
|
||||
> **Important**
|
||||
>
|
||||
> If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
{: .important}
|
||||
Note that Docker Desktop will not run if you do not agree to the terms. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
|
||||
For more information, see [Docker Desktop Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" }. We recommend that you also read the [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
|
||||
For more information, see [Docker Desktop Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" }. We recommend that you also read the [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
### Install from the command line
|
||||
|
||||
|
|
|
@ -15,20 +15,18 @@ redirect_from:
|
|||
- /installation/windows/
|
||||
---
|
||||
|
||||
Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows.
|
||||
|
||||
[Docker Desktop for Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn }
|
||||
|
||||
_For checksums, see [Release notes](../release-notes.md)_
|
||||
|
||||
> **Docker Desktop terms**
|
||||
>
|
||||
> Commercial use of Docker Desktop in larger enterprises (more than 250
|
||||
> employees OR more than $10 million USD in annual revenue) requires a paid
|
||||
> subscription.
|
||||
|
||||
Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows.
|
||||
|
||||
> Download Docker Desktop for Windows
|
||||
>
|
||||
> [Docker Desktop for Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn }
|
||||
|
||||
_For checksums, see [Release notes](../release-notes.md)_
|
||||
|
||||
## System requirements
|
||||
|
||||
Your Windows machine must meet the following requirements to successfully install Docker Desktop.
|
||||
|
@ -184,10 +182,7 @@ Docker Desktop does not start automatically after installation. To start Docker
|
|||
|
||||
3. Select **Accept** to continue. Docker Desktop starts after you accept the terms.
|
||||
|
||||
> **Important**
|
||||
>
|
||||
> If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
{: .important}
|
||||
Note that Docker Desktop will not run if you do not agree to the terms. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
|
||||
For more information, see [Docker Desktop Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement/){:target="_blank" rel="noopener" class="_"}. We recommend that you also read the [FAQs](https://www.docker.com/pricing/faq){: target="\_blank" rel="noopener" class="*" id="dkr_docs_desktop_install_btl"}.
|
||||
|
||||
|
|
Loading…
Reference in New Issue