From bde9629d685bb0137a052101044bd795616908dc Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 1 Sep 2022 16:33:19 +0100 Subject: [PATCH] changes to DD license copy - ONLY MERGE WITH DD 4.12 (#15457) * changes to DD license copy * edits * edits * edits * more edits * more edits * removed extra notes * change to get docker page --- _includes/desktop-license-update.md | 10 ++++------ _includes/desktop-update.md | 6 +----- _includes/eula-modal.html | 8 ++++---- _includes/eula.md | 8 +++----- desktop/faqs/general.md | 5 ++--- desktop/index.md | 5 ++--- desktop/install/linux-install.md | 9 +++++++-- desktop/install/mac-install.md | 11 +++++------ desktop/install/windows-install.md | 16 ++++++++-------- desktop/previous-versions/3.x-mac.md | 11 ----------- desktop/previous-versions/3.x-windows.md | 11 ----------- desktop/windows/wsl.md | 7 ------- get-docker.md | 5 ++--- subscription/index.md | 8 ++++---- 14 files changed, 42 insertions(+), 78 deletions(-) diff --git a/_includes/desktop-license-update.md b/_includes/desktop-license-update.md index 81f22670b1..ac9ee242e3 100644 --- a/_includes/desktop-license-update.md +++ b/_includes/desktop-license-update.md @@ -1,10 +1,8 @@ - **Here’s a summary of the key changes:** + Here’s a summary of the key points: - - 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 annual 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. - - The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription . + - Docker Desktop is free for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. + - Otherwise, it requires a paid subscription for professional use. + - Paid subscriptions are also required for government entities. - The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop. diff --git a/_includes/desktop-update.md b/_includes/desktop-update.md index 525c44255c..66afae80f2 100644 --- a/_includes/desktop-update.md +++ b/_includes/desktop-update.md @@ -4,13 +4,9 @@ When an update is available, Docker Desktop displays an icon on the Docker menu Starting with Docker Desktop 4.2.0, the option to turn off the automatic check for updates is available for users on all Docker subscriptions, including Docker Personal and Docker Pro.. -> **Docker Subscription Service Agreement** -> -> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} to learn more about the changes. - Click **Download update** When you are ready to download the update. This downloads the update in the background. After downloading the update, click **Update and restart** from the Docker menu. This installs the latest update and restarts Docker Desktop for the changes to take effect. -When Docker Desktop starts, it displays the Docker Subscription Service Agreement window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. +When Docker Desktop starts, it displays the Docker Subscription Service Agreement window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the terms and then click **Accept** to continue. > **Important** > diff --git a/_includes/eula-modal.html b/_includes/eula-modal.html index 7eb058078e..3673066579 100644 --- a/_includes/eula-modal.html +++ b/_includes/eula-modal.html @@ -9,10 +9,10 @@

- We've updated the Docker Subscription Service Agreement. - Please read the announcement - and FAQs - to learn how companies using Docker Desktop may be affected. + We’ve updated the Docker Subscription Service Agreement for all versions before 4.0.0 of Docker Desktop. +

+

+ Docker Desktop is free for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. Otherwise, it requires a paid subscription for professional use. Paid subscriptions are also required for government entities. Read the FAQs to learn more.

By clicking "Accept and Download", you agree to these updated diff --git a/_includes/eula.md b/_includes/eula.md index 2496b39607..cce88bdc97 100644 --- a/_includes/eula.md +++ b/_includes/eula.md @@ -1,8 +1,6 @@ -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_relnotes_btl"}. -Please [read the announcement](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"} -and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"} -to learn how companies using Docker Desktop may be affected. -By downloading Docker Desktop, you agree to these updated [terms](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}, +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_relnotes_btl"}. for all versions before 4.0.0 of Docker Desktop. +Docker Desktop is free for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. Otherwise, it requires a paid subscription for professional use. Paid subscriptions are also required for government entities. [Read the FAQ] (https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"} to learn more. +By clicking **Accept and download**, you agree to these [terms](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}, the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"}, and the [Data Privacy Policy](https://www.docker.com/legal/docker-privacy-policy){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"}. diff --git a/desktop/faqs/general.md b/desktop/faqs/general.md index cf8c6cf687..60afe277ab 100644 --- a/desktop/faqs/general.md +++ b/desktop/faqs/general.md @@ -30,10 +30,9 @@ You can find the checksums on the [release notes](../release-notes.md) page. ### Do I need to pay to use Docker Desktop? -Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $10 million in annual 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. When downloading and installing Docker Desktop, you are asked to agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}. +Docker Desktop is free for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open-source projects. Otherwise, it requires a paid subscription for professional use. Paid subscriptions are also required for government entities. When downloading and installing Docker Desktop, you are asked to agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}. -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. For information about Docker Desktop licensing, see [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement). +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 more. ### Can I use Docker Desktop offline? diff --git a/desktop/index.md b/desktop/index.md index 8e23d5e6ee..8ed8e53d91 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -11,12 +11,11 @@ redirect_from: - /docker-for-windows/opensource/ --- -> **Update to the Docker Desktop terms** +> **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid +> employees OR more than $10 million USD in annual revenue) requires a paid > subscription. -{: .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. diff --git a/desktop/install/linux-install.md b/desktop/install/linux-install.md index 50fbe8744a..174689c5d5 100644 --- a/desktop/install/linux-install.md +++ b/desktop/install/linux-install.md @@ -5,6 +5,11 @@ 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 system requirements, download URLs, and instructions on how to install and update Docker Desktop for Linux. @@ -134,14 +139,14 @@ Log out and log back in so that your group membership is re-evaluated. 3. Select **Docker Desktop** to start Docker.
The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. -4. Select the checkbox to accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms. +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} - For more information, see [Docker Desktop License Agreement](../../subscription/index.md#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. + For more information, see [Docker Desktop Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement). 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"}. ## Differences between Docker Desktop for Linux and Docker Engine diff --git a/desktop/install/mac-install.md b/desktop/install/mac-install.md index 00b19610b8..668de6dc32 100644 --- a/desktop/install/mac-install.md +++ b/desktop/install/mac-install.md @@ -9,12 +9,11 @@ redirect_from: - /installation/mac/ --- -> **Update to the Docker Desktop terms** +> **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid +> employees OR more than $10 million USD in annual revenue) requires a paid > subscription. -{: .important} Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, instructions to install and update Docker Desktop for Mac. @@ -78,18 +77,18 @@ Your Mac must meet the following requirements to install Docker Desktop successf ![Docker app in Hockeyapp](images/docker-app-in-apps-mac.png) -3. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. It includes a change to the terms of use for Docker Desktop. +3. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. {% include desktop-license-update.md %} -4. Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms. +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} - For more information, see [Docker Desktop License Agreement](../../subscription/index.md#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. + For more information, see [Docker Desktop Subscri[tion Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement). 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"}. ### Install from the command line diff --git a/desktop/install/windows-install.md b/desktop/install/windows-install.md index eb166de53e..1569019e0a 100644 --- a/desktop/install/windows-install.md +++ b/desktop/install/windows-install.md @@ -15,12 +15,11 @@ redirect_from: - /installation/windows/ --- -> **Update to the Docker Desktop terms** +> **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid +> employees OR more than $10 million USD in annual revenue) requires a paid > subscription. -> {: .important} 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. @@ -174,18 +173,19 @@ Docker Desktop does not start automatically after installation. To start Docker ![search for Docker app](images/docker-app-search.png){:width="300px"} -2. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. It includes a change to the terms of use for Docker Desktop. +2. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. {% include desktop-license-update.md %} -3. Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms. +3. Select **Accept** to continue. Docker Desktop starts after you accept the terms. > **Important** > - > 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} + > 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 Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement/). 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 License Agreement](../../subscription/index.md#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. ## Updates diff --git a/desktop/previous-versions/3.x-mac.md b/desktop/previous-versions/3.x-mac.md index f46c8762c0..01dd3a9776 100644 --- a/desktop/previous-versions/3.x-mac.md +++ b/desktop/previous-versions/3.x-mac.md @@ -12,17 +12,6 @@ redirect_from: This page contains release notes for Docker Desktop for Mac 3.x. -> **Update to the Docker Desktop terms** -> -> Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid -> subscription. The grace period for those that will require a paid subscription -> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: - target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. -{: .important} - -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. - ## Docker Desktop 3.6.0 2021-08-11 diff --git a/desktop/previous-versions/3.x-windows.md b/desktop/previous-versions/3.x-windows.md index 24ee715324..1f7569103e 100644 --- a/desktop/previous-versions/3.x-windows.md +++ b/desktop/previous-versions/3.x-windows.md @@ -12,17 +12,6 @@ redirect_from: This page contains release notes for Docker Desktop for Windows 3.x. -> **Update to the Docker Desktop terms** -> -> Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid -> subscription. The grace period for those that will require a paid subscription -> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: - target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. -{: .important} - -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. - ## Docker Desktop 3.6.0 2021-08-11 diff --git a/desktop/windows/wsl.md b/desktop/windows/wsl.md index 420c037573..ae7daec98c 100644 --- a/desktop/windows/wsl.md +++ b/desktop/windows/wsl.md @@ -7,13 +7,6 @@ redirect_from: title: Docker Desktop WSL 2 backend --- -> **Update to the Docker Desktop terms** -> -> Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid -> subscription. -{: .important} - Windows Subsystem for Linux (WSL) 2 introduces a significant architectural change as it is a full Linux kernel built by Microsoft, allowing Linux distributions to run without having to manage Virtual Machines. With Docker Desktop running on WSL 2, users can leverage Linux workspaces and avoid having to maintain both Linux and Windows build scripts. In addition, WSL 2 provides improvements to file system sharing, boot time, and allows access to some cool new features for Docker Desktop users. Docker Desktop uses the dynamic memory allocation feature in WSL 2 to greatly improve the resource consumption. This means, Docker Desktop only uses the required amount of CPU and memory resources it needs, while enabling CPU and memory-intensive tasks such as building a container to run much faster. diff --git a/get-docker.md b/get-docker.md index 4c6773e2e4..f4399c08a6 100644 --- a/get-docker.md +++ b/get-docker.md @@ -8,12 +8,11 @@ redirect_from: - /installation/ --- -> **Update to the Docker Desktop terms** +> **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid +> employees OR more than $10 million USD in annual revenue) and in government entities requires a paid > subscription. -{: .important} Docker is an open platform for developing, shipping, and running applications. Docker enables you to separate your applications from your infrastructure so you diff --git a/subscription/index.md b/subscription/index.md index 1a07ad1515..b3fdf9bb8b 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -61,11 +61,11 @@ 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. -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. +Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} states: -- It **remains free** for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. -- It requires a paid subscription for professional use in larger enterprises. -- The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription . + - Docker Desktop is free for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. + - Otherwise, it requires a paid subscription for professional use. +- Paid subscriptions are also required for government entities. - 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.