diff --git a/get-docker.md b/get-docker.md index fac5cfc1c3..fa312de769 100644 --- a/get-docker.md +++ b/get-docker.md @@ -9,9 +9,12 @@ redirect_from: --- Docker is an open platform for developing, shipping, and running applications. -Docker enables you to separate your applications from your infrastructure so you + +Docker allows you to separate your applications from your infrastructure so you can deliver software quickly. With Docker, you can manage your infrastructure in -the same ways you manage your applications. By taking advantage of Docker’s +the same ways you manage your applications. + +By taking advantage of Docker’s methodologies for shipping, testing, and deploying code quickly, you can significantly reduce the delay between writing code and running it in production. diff --git a/release-lifecycle.md b/release-lifecycle.md index 3a81b0e524..dfb745177f 100644 --- a/release-lifecycle.md +++ b/release-lifecycle.md @@ -16,8 +16,8 @@ This page details Docker's product release lifecycle and how Docker defines each | --- | --- | ---- | ---| ---| |[Experimental](#experimental)| Limited availability | Community support |Software may have limitations, bugs and/or stability concerns | Can be discontinued without notice | |[Beta](#beta) | All or those involved in a Beta Feedback Program | Community support | Software may have limitations, bugs and/or stability concerns | Can be discontinued without notice | -| [Early Access (EA)](#early-access-ea) | All or those involved in an Early Access Feedback Program | Full | Software may have limitations, bugs and/or stability concerns. These limitations will be documented. | Follows [retirement process](#retirement-process) | -| [General Availability (GA)](#general-availability-ga) | All | Full | Few or no limitations for supported use cases | Follows [retirement process](#retirement-process) | +| [Early Access (EA)](#early-access-ea) | All or those involved in an Early Access Feedback Program | Full | Software may have limitations, bugs and/or stability concerns. These limitations will be documented. | Follows the [retirement process](#retirement-process) | +| [General Availability (GA)](#general-availability-ga) | All | Full | Few or no limitations for supported use cases | Follows the [retirement process](#retirement-process) | ### Experimental diff --git a/release-notes/index.md b/release-notes/index.md index ee37c8f0da..bea95bf793 100644 --- a/release-notes/index.md +++ b/release-notes/index.md @@ -4,9 +4,12 @@ keywords: docker, documentation, about, technology, understanding, release title: Docker release notes --- -Find out what's new in Docker. Release notes contain information about new -features, improvements, known issues, and bug fixes in each release. You can -find release notes for each component in the Manuals section. We suggest +Find out what's new in Docker. + +Release notes contain information about new +features, improvements, known issues, and bug fixes in each release. + +You can find release notes for each component in the Manuals section. We suggest that you regularly visit the release notes to learn about updates.
diff --git a/security/index.md b/security/index.md index d397b4e3d6..9ea3a62e87 100644 --- a/security/index.md +++ b/security/index.md @@ -14,8 +14,8 @@ We strongly encourage you to update to the latest version of [Apache Commons Tex ### Scan images on Docker Hub -Docker Hub security scans triggered **after 1200 UTC 21 October 2021** are now -correctly identifying the Text4Shell CVE. Scans before this date **do not** +Docker Hub security scans triggered after 1200 UTC 21 October 2021 are now +correctly identifying the Text4Shell CVE. Scans before this date do not currently reflect the status of this vulnerability. Therefore, we recommend that you trigger scans by pushing new images to Docker Hub to view the status of the Text4Shell CVE in the vulnerability report. For detailed instructions, see [Scan images on Docker Hub](../docker-hub/vulnerability-scanning.md). @@ -86,8 +86,8 @@ target="_blank" rel="noopener" class="_"}, the fix made in version 2.15.0 was ### Scan images on Docker Hub -Docker Hub security scans triggered **after 1700 UTC 13 December 2021** are now -correctly identifying the Log4j 2 CVEs. Scans before this date **do not** +Docker Hub security scans triggered after 1700 UTC 13 December 2021 are now +correctly identifying the Log4j 2 CVEs. Scans before this date do not currently reflect the status of this vulnerability. Therefore, we recommend that you trigger scans by pushing new images to Docker Hub to view the status of Log4j 2 CVE in the vulnerability report. For detailed instructions, see [Scan images on Docker Hub](../docker-hub/vulnerability-scanning.md). diff --git a/support/index.md b/support/index.md index 82a82b09b7..2109ab52e6 100644 --- a/support/index.md +++ b/support/index.md @@ -8,12 +8,6 @@ redirect_from: Find information on how to get support, and the scope of Docker support. -{% include upgrade-cta.html - body="Docker offers support for developers subscribed to a Pro, Team, or a Business tier. Upgrade now to benefit from Docker Support." - header-text="This feature requires a paid Docker subscription" - target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support" -%} - ## How do I get support? If you have a paid Docker subscription, raise a ticket through [Docker support](https://hub.docker.com/support/contact/){:target="_blank" rel="noopener" class="_"}. @@ -39,15 +33,15 @@ If you have a paid Docker subscription, you can get support for the following ty * Installation crashes * Failure to launch Docker Desktop on first run * Desktop update issues - * Login issues in both the command line interface and Docker Hub user interface + * Sign-in issues in both the command line interface and Docker Hub user interface * Push or pull issues, including rate limiting * Usage issues * Crash closing software * Docker Desktop not behaving as expected For Windows users, you can also request support on: - * Enabling virtualization in BIOS - * Enabling Windows features + * Turning on virtualization in BIOS + * Turning on Windows features * Running inside [certain VM or VDI environments](../desktop/vm-vdi.md) (Docker Business customers only) @@ -57,8 +51,8 @@ Docker excludes support for the following types of issues: * Altered or modified Docker software * Any version of the Docker software other than the latest version * Defects in the Docker software due to hardware malfunction, abuse, or improper use - * Docker Support excludes training, customization, and integration - * Features labeled as experimental + * Docker support excludes training, customization, and integration + * Features labeled as experimental or beta * Reimbursing and expenses spent for third-party services not provided by Docker * Routine product maintenance (data backup, cleaning disk space and configuring log rotation) * Running containers of a different architecture using emulation @@ -80,7 +74,7 @@ For Pro and Team customers, Docker only offers support for the latest version of ## How many machines can I get support for Docker Desktop on? As a Pro user you can get support for Docker Desktop on a single machine. -As a Team, you can get support for Docker Desktop for the number of machines equal to the number of seats as part of your plan. +As a Team user, you can get support for Docker Desktop for the number of machines equal to the number of seats as part of your plan. ## What OS’s are supported? @@ -101,7 +95,7 @@ For more information, see [Docker Data Processing Agreement](https://www.docker. ## What can I do before seeking support? -Before seeking support, you can perform basic troubleshooting. See [Diagnose and Troubleshooting](../desktop/troubleshoot/overview.md) for more information. +Before seeking support, you can perform basic troubleshooting. See [Diagnose and troubleshooting](../desktop/troubleshoot/overview.md) for more information. You can also see if an answer already exists in the following FAQs: - [Docker Business or Team onboarding](../docker-hub/general-faqs.md)