From a55b17afc4b19d4e2db1143a71eb22aceb7045b8 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Mon, 23 Nov 2020 13:20:48 +0000 Subject: [PATCH 1/2] Bump the notes on Docker support --- _data/toc.yaml | 36 ++++++++++++++-------------- docker-for-mac/troubleshoot.md | 8 +++---- docker-for-windows/troubleshoot.md | 8 +++---- docker-hub/vulnerability-scanning.md | 6 ++--- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index dd6571853d03..8419c94f51f0 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1222,24 +1222,6 @@ manuals: title: Teams and organizations - path: /docker-hub/repos/ title: Repositories - - sectiontitle: Administration - section: - - path: /docker-hub/convert-account/ - title: Convert an account into an organization - - path: /docker-hub/deactivate-account/ - title: Deactivate an account or an organization - - sectiontitle: Billing - section: - - path: /docker-hub/billing/ - title: Overview - - path: /docker-hub/billing/upgrade/ - title: Upgrade your plan - - path: /docker-hub/billing/downgrade/ - title: Downgrade your plan - - path: /docker-hub/billing/add-seats/ - title: Add seats - - path: /docker-hub/billing/remove-seats/ - title: Remove seats - path: /docker-hub/vulnerability-scanning/ title: Vulnerability scanning - path: /docker-hub/official_images/ @@ -1258,6 +1240,24 @@ manuals: title: Webhooks - path: /docker-hub/slack_integration/ title: Slack integration + - sectiontitle: Administration + section: + - path: /docker-hub/convert-account/ + title: Convert an account into an organization + - path: /docker-hub/deactivate-account/ + title: Deactivate an account or an organization + - sectiontitle: Billing + section: + - path: /docker-hub/billing/ + title: Overview + - path: /docker-hub/billing/upgrade/ + title: Upgrade your plan + - path: /docker-hub/billing/downgrade/ + title: Downgrade your plan + - path: /docker-hub/billing/add-seats/ + title: Add seats + - path: /docker-hub/billing/remove-seats/ + title: Remove seats - sectiontitle: Publisher & certified content section: - path: /docker-hub/publish/ diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index 7789e2eee493..f9e53bc00e7c 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -7,6 +7,8 @@ title: Logs and troubleshooting toc_max: 2 --- +> Did you know that Docker Desktop now offers support for developers subscribed to a Pro or a Team plan? Click [here](#support) to learn more. + This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support (Pro and Team plan users only), send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems. ## Troubleshoot @@ -316,11 +318,7 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install ## Support -This section contains information on how to get support on Docker Desktop. - ->**Note** -> -> Docker Desktop offers support for Pro and Team users only. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +Docker Desktop offers support for developers subscribed to a [Pro or a Team plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. This section contains instructions on how to get support, and covers the scope of Docker Desktop support. ### How do I get Docker Desktop support? diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index ca772cc5bd67..49199a6b7508 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -8,6 +8,8 @@ title: Logs and troubleshooting toc_max: 2 --- +> Did you know that Docker Desktop now offers support for developers subscribed to a Pro or a Team plan? Click [here](#support) to learn more. + This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support (Pro and Team plan users only), send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems. ## Troubleshoot @@ -328,11 +330,7 @@ explore other workarounds suggested on Docker Desktop forums. ## Support -This section contains information on how to get support on Docker Desktop. - ->**Note** -> -> Docker Desktop offers support for Pro and Team users only. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +Docker Desktop offers support for developers subscribed to a [Pro or a Team plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. This section contains instructions on how to get support, and covers the scope of Docker Desktop support. ### How do I get Docker Desktop support? diff --git a/docker-hub/vulnerability-scanning.md b/docker-hub/vulnerability-scanning.md index 63566341a55f..c6b51c7d2280 100644 --- a/docker-hub/vulnerability-scanning.md +++ b/docker-hub/vulnerability-scanning.md @@ -4,14 +4,12 @@ keywords: scanning, vulnerabilities, Hub, Snyk title: Hub Vulnerability Scanning --- +> Docker Hub Vulnerability Scanning is available for developers subscribed to a Pro or a Team plan. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. + Docker Hub Vulnerability Scanning enables you to automatically scan Docker images for vulnerabilities using Snyk. This uses the same technology as the [docker scan](../engine/scan/index.md) command. When you push an image to Docker Hub after enabling vulnerability scanning, Docker Hub automatically scans the image to identify vulnerabilities in your container images. Vulnerability Scanning allows developers and development teams to review the security state of the container images and take actions to fix issues identified during the scan, resulting in more secure deployments. The scan result includes the source of the vulnerability, such as OS packages and libraries, version in which it was introduced, and a recommended fixed version (if available) to remediate the vulnerabilities discovered. -> **Note** -> -> Docker Hub Vulnerability Scanning is available for users subscribed to a Pro or a Teams plan. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. - ## Scan images Hub Vulnerability scanning allows repository owners and administrators of a Pro or a Team plan to enable and disable scanning. From 0919a5f8c38ad44b8503ca92a0e77b7460062b9b Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 24 Nov 2020 14:03:09 +0000 Subject: [PATCH 2/2] Add a clear CTA to upgrade --- _data/toc.yaml | 4 ++-- docker-for-mac/troubleshoot.md | 4 +++- docker-for-windows/troubleshoot.md | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 8419c94f51f0..c9019fb62643 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1240,6 +1240,8 @@ manuals: title: Webhooks - path: /docker-hub/slack_integration/ title: Slack integration + - path: /docker-hub/download-rate-limit/ + title: Download rate limit - sectiontitle: Administration section: - path: /docker-hub/convert-account/ @@ -1276,8 +1278,6 @@ manuals: title: Trust chain - path: /docker-hub/publish/byol/ title: Bring Your Own License (BYOL) - - path: /docker-hub/download-rate-limit/ - title: Download rate limit - path: /docker-hub/release-notes/ title: Release notes - sectiontitle: Open-source projects diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index f9e53bc00e7c..7f2d702a2ac0 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -318,7 +318,9 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install ## Support -Docker Desktop offers support for developers subscribed to a [Pro or a Team plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. This section contains instructions on how to get support, and covers the scope of Docker Desktop support. +Docker Desktop offers support for developers subscribed to a Pro or a Team plan. Click [here](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} to upgrade your existing account. + +This section contains instructions on how to get support, and covers the scope of Docker Desktop support. ### How do I get Docker Desktop support? diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 49199a6b7508..81a8f5504b38 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -330,7 +330,9 @@ explore other workarounds suggested on Docker Desktop forums. ## Support -Docker Desktop offers support for developers subscribed to a [Pro or a Team plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. This section contains instructions on how to get support, and covers the scope of Docker Desktop support. +Docker Desktop offers support for developers subscribed to a Pro or a Team plan. Click [here](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} to upgrade your existing account. + +This section contains instructions on how to get support, and covers the scope of Docker Desktop support. ### How do I get Docker Desktop support?