diff --git a/_includes/desktop-license-update.md b/_includes/desktop-license-update.md index 4fe2c49af4..b0362b5bc5 100644 --- a/_includes/desktop-license-update.md +++ b/_includes/desktop-license-update.md @@ -1,16 +1,10 @@ - > **Docker Subscription Service Agreement** - > - > We’ve updated the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"}. Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} to learn how companies using Docker Desktop may be affected. - **Here’s a summary of the key changes:** - - Our Docker Subscription Service Agreement include a change to the terms of use for Docker Desktop - - It **remains free** for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open source projects. - - It requires a paid subscription for professional use in larger enterprises. - - The effective date of these terms is August 31, 2021. There is a **grace period** until January 31, 2022 for those that will require a paid subscription to use Docker Desktop. + - Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} includes a change to the terms of use for Docker Desktop + - It **remains free** for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open source projects. + - It requires a paid subscription for professional use in larger enterprises. + - The effective date of these terms is August 31, 2021. There is a **grace period** until January 31, 2022 for those that will require a paid subscription to use Docker Desktop. - The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription . - The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop. - - diff --git a/desktop/index.md b/desktop/index.md index dd9bcba438..775758776d 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -10,6 +10,11 @@ redirect_from: - /docker-for-windows/opensource/ --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). +{: .important} + Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes [Docker Engine](../engine/index.md), Docker CLI client, diff --git a/desktop/mac/install.md b/desktop/mac/install.md index a1e62027a6..ebf4558899 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -82,7 +82,7 @@ The Docker Desktop installation includes > 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} - For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). + For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). We recommend that you also read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} to learn how companies using Docker Desktop may be affected. ### Quick start guide diff --git a/desktop/mac/release-notes.md b/desktop/mac/release-notes.md index 31d938d429..27577363f9 100644 --- a/desktop/mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -10,6 +10,11 @@ toc_min: 1 toc_max: 2 --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). +{: .important} + This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. ## Docker Desktop 4.0.1 diff --git a/desktop/windows/install.md b/desktop/windows/install.md index 126b775ea4..e11c772069 100644 --- a/desktop/windows/install.md +++ b/desktop/windows/install.md @@ -134,7 +134,7 @@ Docker Desktop does not start automatically after installation. To start Docker > If you do not agree to the updated 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} - For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). + For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). We recommend that you also read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} to learn how companies using Docker Desktop may be affected. ### Quick Start Guide diff --git a/desktop/windows/release-notes.md b/desktop/windows/release-notes.md index 73e9a433c9..c1ab6eebaf 100644 --- a/desktop/windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -10,6 +10,11 @@ toc_min: 1 toc_max: 2 --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). +{: .important} + This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. ## Docker Desktop 4.0.1 diff --git a/subscription/index.md b/subscription/index.md index c520e00dd8..4cab67885e 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -10,7 +10,7 @@ redirect_from: On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers and businesses. Docker subscription tiers now include Personal, Pro, Team, and Business. -### Here's a summary of the changes +### Summary of the changes - We’re introducing a **new** product subscription, Docker Business, for organizations using Docker at scale for application development and require features like secure software supply chain management, single sign-on (SSO), container registry access controls, and more. @@ -62,19 +62,16 @@ For a list of features available in each tier, see [Docker Pricing](https://www. Docker Desktop is licensed under the Docker Subscription Service Agreement. When you download and install Docker Desktop, you will be asked to agree to the updated terms. -> **Docker Subscription Service Agreement** -> -> We’ve updated the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} to learn how companies using Docker Desktop may be affected. +Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} includes a change to the terms of use for Docker Desktop. -**Here’s a summary of the key changes:** - -- Our Docker Subscription Service Agreement include a change to the terms of use for Docker Desktop - - It **remains free** for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open source projects. - - It requires a paid subscription for professional use in larger enterprises. +- It **remains free** for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open source projects. +- It requires a paid subscription for professional use in larger enterprises. - The effective date of these terms is August 31, 2021. There is a **grace period** until January 31, 2022 for those that will require a paid subscription to use Docker Desktop. - The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription . - The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop. +Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} and [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} to learn how companies using Docker Desktop may be affected. + > **Note** > > The licensing and distribution terms for Docker and Moby **open-source** projects, such as Docker Engine, are not changing.