Merge pull request #13448 from docker/master

Publish updates from master

_config.yml

@@ -28,20 +28,6 @@ compose_file_v2: "2.4"
 machine_version: "0.16.0"
 distribution_version: "2.7"
 
-# URLs for license and conditions
-# TODO move these inline once these are stable / final
-# TODO add final link to DSST
-dsst_url: "https://www.docker.com/legal/docker-subscription-service-agreement" # Docker Subscription Service Agreement
-
-# Link to Docker Subscription Service Agreement announcement blog-post
-dsst_announcement_url: "https://www.docker.com/blog/updating-product-subscriptions/"
-
-# Link to Docker Subscription Service Agreement FAQs
-dsst_faqs_url: "https://www.docker.com/pricing/faq"
-
-# Link to Docker Terms of Service
-tos_url: "https://www.docker.com/legal/docker-terms-service"
-
 # List of plugins to enable for local development builds. Mostly the same as
 # for production, but without the "jekyll-sitemap" plugin, which is not needed
 # for previewing, and excluding saves some time to build

_includes/eula.md

@@ -1,8 +1,8 @@
 <!-- This text will be included in topics containing Docker Desktop download URLs -->
-<span class="no-js">We've updated the [Docker Subscription Service Agreement]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"}.
+<span class="no-js">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]({{ site.dsst_announcement_url }}){: 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]({{ site.dsst_faqs_url }}){: 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]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"},
+By downloading Docker Desktop, you agree to these updated [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"}.</span>

_scss/_layout.scss

@@ -113,7 +113,6 @@ section.section {
     top:            $top-navigation-height;
     overflow:       auto;
     max-height:     calc(100vh - #{$top-navigation-height});
-    padding-top:    15px;
     padding-bottom: 20px;
 }
 

_scss/_navigation.scss

@@ -76,14 +76,16 @@
 }
 
 .nav-sidebar ul li a,
-.nav-sidebar ul li a:focus,
+.nav-sidebar ul li a:focus {
-.nav-sidebar ul li a:hover {
     border-bottom: none;
-    border-left:   4px solid rgba($primary-links, 0);
+    border-left:   1px solid $primary-links;
 }
 
 .nav-sidebar .nav > li > a {
   padding-left: 22px; // left-padding to align with logo
+  &.active {
+    padding-left: 19px; // compensate for 1px -> 4px border-width
+  }
   @include before-md-width {
     padding-right: 32px; // right-align with hamburger menu
   }
@@ -96,10 +98,9 @@
     font-weight: 600;
 }
 
-.nav-sidebar ul li li a {
+.nav-sidebar ul li ul li a {
-    border-left: 1px solid $primary-links;
+  font-size:   12px;
-    font-size: 12px;
+  margin-left:  8px;
-    margin-left: 15px;
 }
 
 .nav-sidebar .caret {
@@ -141,8 +142,8 @@
 }
 
 .toc-nav li a.active {
-    color: #2089C4;
+    color: $primary-links;
-    border-left: 4px solid #2089C4;
+    border-left: 4px solid $primary-links;
     font-weight: bold;
 }
 
@@ -218,7 +219,7 @@ div#side-toc-title {
 }
 
 input:focus+.slider {
-    box-shadow: 0 0 1px #2196F3;
+    box-shadow: 0 0 1px $slider-btn;
 }
 
 input:checked+.slider:before {
@@ -275,7 +276,7 @@ input:checked+.slider:before {
  */
 
 .feedback-links {
-    margin: 0 0 10px 0;
+    margin: 15px 0 10px 0;
 }
 
 /* polldaddy */

_scss/_night-mode.scss

@@ -56,7 +56,7 @@ body.night {
         border: none;
     }
     .nav-sidebar ul li a.active,
-    .nav-sidebar.nav>li>a:focus,
+    .nav-sidebar.nav > li > a:focus,
     .toc-nav li a.active {
         background:  $bg-sidebar-night-active;
         border-left: 4px solid $primary-links;

_scss/_typography.scss

@@ -43,6 +43,8 @@ h1,h2,h3,h4,h5,h6 {
     font-family: $headings;
     clear: both;
     line-height: 26px;
+    margin-top:  30px;
+    margin-bottom: 0;
 }
 
 h1 {
@@ -75,3 +77,7 @@ h6 {
 dd, dt {
     line-height: 25px;
 }
+
+ol, ul {
+  padding-left: 25px;
+}

desktop/index.md

@@ -6,6 +6,8 @@ toc_min: 1
 toc_max: 2
 redirect_from:
 - /desktop/opensource/
+- /docker-for-mac/opensource/
+- /docker-for-windows/opensource/
 ---
 
 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/), Docker CLI client, [Docker Compose](../compose/), [Docker Content Trust](../engine/security/trust.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
@@ -31,6 +33,8 @@ Docker Desktop is available for Mac and Windows. For download information, syste
 * [Install Docker Desktop on Mac](mac/install.md)
 * [Install Docker Desktop on Windows](windows/install.md)
 
+For information about Docker Desktop licensing, see [Docker Desktop License Agreement](../subscription/index.md#docker-desktop-license-agreement).
+
 ## Configure Docker Desktop
 
 To learn about the various UI options and their usage, see:

desktop/windows/release-notes.md

@@ -85,7 +85,7 @@ The updated [Docker Subscription Service Agreement](https://www.docker.com/lega
 - Fixed slowness when adding multiple ports forwarding option.
 - Fixed bug where the WSL 2 synchonization code creates dangling symlinks if the WSL 2 home directory if it is the same as the Windows home directory. Fixes [docker/for-win#11668](https://github.com/docker/for-win/issues/11668).
 - Fixed `docker context ls` after upgrade from 3.5.x when the Linux WSL 2 home directory is the same as the Windows home directory.
-- Fixed the permissions on `%PROGRAMDATA%\Docker` to avoid a potential Windows containers compromise. See [CVE-2021-37841](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-37841){:target="_blank" rel="noopener" class="_"}.
+- Fixed the permissions on `%PROGRAMDATA%\Docker` to avoid a potential Windows containers compromise. See [CVE-2021-37841](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-37841){:target="_blank" rel="noopener" class="_"}. Thanks to [Alessio Dalla Piazza](http://it.linkedin.com/in/alessiodallapiazza) for discovering the issue and to @kevpar for helpful discussion.
 - Fixed bug where the Linux home directory under WSL 2 was set to the Windows home directory e.g. `/mnt/c/Users/...`.
 - Fixed bug where Desktop would fail to start if it could not parse CLI contexts. Fixes [docker/for-win#11601](https://github.com/docker/for-win/issues/11601).
 - Fixed an issue related to log display inside a container [docker/for-win#11251](https://github.com/docker/for-win/issues/11251).

subscription/index.md

@@ -8,7 +8,7 @@ redirect_from:
 - /subscription/faq/
 ---
 
-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. 
+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
 
@@ -16,10 +16,10 @@ On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-
 
 - 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 for **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 (**Pro, Team, or Business**), for as little as $5 a month, for professional use in larger enterprises. 
+    - It requires a paid subscription (**Pro, Team, or Business**), for as little as $5 a month, 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 Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop.
-- The existing Docker Free subscription has been renamed **Docker Personal**. 
+- The existing Docker Free subscription has been renamed **Docker Personal**.
 - **No changes** to Docker Engine or any other upstream **open-source** Docker or Moby project.
 
 To understand how these changes affect you, read the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.
@@ -36,7 +36,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
 
 ## Docker Pro
 
-**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It reduces the amount of time developers spend on mundane and repetitive tasks and empowers developers to spend more time creating value for their customers. 
+**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It reduces the amount of time developers spend on mundane and repetitive tasks and empowers developers to spend more time creating value for their customers.
 
 Docker Pro includes all the features available in Personal, additionally, it includes unlimited private repositories, unlimited public repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, [Auto Builds](../docker-hub/builds/index.md) with 5 concurrent builds, 300 [Hub Vulnerability Scans](../docker-hub/vulnerability-scanning.md), 5 [Scoped Access Tokens](../docker-hub/access-tokens.md), and more.
 
@@ -44,7 +44,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
 
 ## Docker Team
 
-**Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities. 
+**Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities.
 
 Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit Logs](../docker-hub/audit-log.md), and more.
 
@@ -69,14 +69,17 @@ Docker Desktop is licensed under the Docker Subscription Service Agreement. When
 **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 **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 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.
 
-Docker Desktop is built using open-source software. For information about the licensing of open-source components in Docker Desktop, Select ![whale menu](../desktop/mac/images/whale-x.png){: .inline} > **About Docker Desktop** > **Acknowledgements**.
-
 > **Note**
 >
 > The licensing and distribution terms for Docker and Moby **open-source** projects, such as Docker Engine, are not changing.
+
+Docker Desktop is built using open-source software. For information about the licensing of open-source components in Docker Desktop, Select ![whale menu](../desktop/mac/images/whale-x.png){: .inline} > **About Docker Desktop** > **Acknowledgements**.
+
+Docker Desktop distributes some components that are licensed under the
+GNU General Public License. Click [here](https://download.docker.com/opensource/License.tar.gz) to download the source for these components.