From d8c04e59b309b6b041cdbbbf391908541ff966dc Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 5 Apr 2017 11:06:53 -0700 Subject: [PATCH] Clarify re Edge releases --- _includes/docker_schedule_matrix.md | 18 ++++++++++++------ engine/installation/index.md | 12 ++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/_includes/docker_schedule_matrix.md b/_includes/docker_schedule_matrix.md index 8ecddcb068..62b2d19528 100644 --- a/_includes/docker_schedule_matrix.md +++ b/_includes/docker_schedule_matrix.md @@ -1,18 +1,24 @@ -{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px"}{% endcapture %} - +{% capture green-check %}![yes](/engine/installation/images/green-check.svg){: style="height: 14px; display: inline-block"}{% endcapture %} +{% capture superscript-link %}[1](#edge-footnote){: style="vertical-align: super; font-size: smaller;" }{% endcapture %} {: style="width: 75%" } | Month | Docker CE Edge | Docker CE Stable | Docker EE | |----------|-------------------|-------------------|-------------------| | January | {{ green-check }} | | | | February | {{ green-check }} | | | -| March | | {{ green-check }} | {{ green-check }} | +| March | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} | | April | {{ green-check }} | | | | May | {{ green-check }} | | | -| June | | {{ green-check }} | {{ green-check }} | +| June | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} | | July | {{ green-check }} | | | | August | {{ green-check }} | | | -| September| | {{ green-check }} | {{ green-check }} | +| September| {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} | | October | {{ green-check }} | | | | November | {{ green-check }} | | | -| December | | {{ green-check }} | {{ green-check }} | \ No newline at end of file +| December | {{ green-check }}{{ superscript-link }} | {{ green-check }} | {{ green-check }} | + +`1`: On Linux distributions, these releases will only appear in the `stable` + channels, not the `edge` channels. For that reason, on Linux distributions, + you need to enable both channels. +{: id="edge-footnote" } + diff --git a/engine/installation/index.md b/engine/installation/index.md index a010190fb5..2d59d5f825 100644 --- a/engine/installation/index.md +++ b/engine/installation/index.md @@ -31,10 +31,11 @@ Docker is available in two editions: Docker CE has both **stable** and **edge** channels. - - **Stable** builds are released once per quarter. - - **Edge** builds are released once per month, except during the months that - Edge builds are released. If you subscribe to the Edge channel, you should - also subscribe to the Stable channel. + - **Stable** builds are released once per quarter and are supported for 4 + months. + - **Edge** builds are released once per month, and are supported for that + month only. If you subscribe to the Edge channel on Linux distributions, you + should also subscribe to the Stable channel. For more information about Docker CE, see [Docker Community Edition](https://www.docker.com/community-edition/){: target="_blank" class="_" }. @@ -59,8 +60,7 @@ Digital Ocean, Packet, SoftLink, or Bring Your Own Cloud. ## Time-based release schedule Starting with Docker 17.03, Docker uses a time-based release schedule, outlined -below. For Docker CE Edge users, if you want to receive each month's release, -you need to subscribe to both the Edge and Stable channels. +below. {% include docker_schedule_matrix.md %}