You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: install/index.md
+23-23Lines changed: 23 additions & 23 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -35,7 +35,7 @@ repositories [Docker Engine](https://github.com/docker/engine) and
35
35
36
36
Releases of Docker Engine and Docker Client for general availability
37
37
are versioned using dotted triples. The components of this triple
38
-
are `YY.mm.<patch>` where the `YY.mm` component is refered to as the
38
+
are `YY.mm.<patch>` where the `YY.mm` component is referred to as the
39
39
year-month release. The version numbering format is chosen to illustrate
40
40
cadence and does not guarantee SemVer, but the desired date for general
41
41
availability. The version number may have additional information, such as
@@ -44,21 +44,21 @@ beta and release candidate qualifications. Such releases are considered
44
44
45
45
The cadence of the year-month releases is every 6 months starting with
46
46
the `18.09` release. The patch releases for a year-month release take
47
-
place as needed to address bug fixes during it's support cycle.
47
+
place as needed to address bug fixes during its support cycle.
48
48
49
-
Docker CE binaries for a release are available on download.docker.com
49
+
Docker CE binaries for a release are available on <download.docker.com>
50
50
as packages for the supported operating systems. Docker EE binaries are
51
-
available on the Docker Store for the supported operating systems. The
51
+
available on the [Docker Store](https://store.docker.com/) for the supported operating systems. The
52
52
release channels are available for each of the year-month releases and
53
53
allow users to "pin" on a year-month release of choice. The release
54
54
channel also receives patch releases when they become available.
55
55
56
56
### Nightly builds
57
57
58
-
Nightly builds are created once per day from the master branch. Version
58
+
Nightly builds are created once per day from the master branch. The version
59
59
number for nightly builds take the format `0.YYYYmmdd.HHMMSS`,
60
60
for example `0.20181231.093045`. These builds allow for testing from the
61
-
latest code on master branch. No qualifications or guarantees are made
61
+
latest code on the master branch. No qualifications or guarantees are made
62
62
for the nightly builds.
63
63
64
64
The release channel for these builds is called `nightly`.
@@ -67,21 +67,21 @@ The release channel for these builds is called `nightly`.
67
67
68
68
In preparation for a new year-month release, a branch is created from
69
69
the master branch with format `YY.mm` when the milestones desired by
70
-
Docker for the release has achieved feature-complete. Pre-releases
71
-
such as betas and release candidates are conducted from their release
72
-
branch. Patch releases and the corresponding pre-releases are performed
70
+
Docker for the release have achieved feature-complete. Pre-releases
71
+
such as betas and release candidates are conducted from their respective release
72
+
branches. Patch releases and the corresponding pre-releases are performed
73
73
from within the corresponding release branch.
74
74
75
75
While pre-releases are done to assist in the stabilization process, no
76
76
guarantees are provided.
77
77
78
78
Binaries built for pre-releases are available in the test channel for
79
-
the targetted year-month release using the naming format `test-YY.mm`,
79
+
the targeted year-month release using the naming format `test-YY.mm`,
80
80
for example `test-18.09`.
81
81
82
82
### General availability
83
83
84
-
Year-month releases are made from a release branch diverged from master
84
+
Year-month releases are made from a release branch diverged from the master
85
85
branch. The branch is created with format `<year>.<month>`, for example
86
86
`18.09`. The year-month name indicates the earliest possible calendar
87
87
month to expect the release to be generally available. All further patch
@@ -96,14 +96,14 @@ test channel.
96
96
97
97
For a given year-month release, Docker releases both CE and EE
98
98
variants concurrently. EE is a superset of the code delivered in
99
-
CE. Docker maintains publicly visible repositories for the CE code,
99
+
CE. Docker maintains publicly visible repositories for the CE code
100
100
as well as private repositories for the EE code. Automation (a bot)
101
101
is used to keep the branches between CE and EE in sync so as features
102
102
and fixes are merged on the various branches in the CE repositories
103
103
(upstream), the corresponding EE repositories and branches are kept
104
-
in sync (downstream). While Docker and our partners make every effort
104
+
in sync (downstream). While Docker and its partners make every effort
105
105
to minimize merge conflicts between CE and EE, occasionally they will
106
-
happen and we'll work hard to resolve them in a timely fashion.
106
+
happen, and Docker will work hard to resolve them in a timely fashion.
107
107
108
108
## Next release
109
109
@@ -118,22 +118,22 @@ release. Docker EE releases are supported for 24 months after the first
118
118
year-month general availability release.
119
119
120
120
This means bug reports and backports to release branches are assessed
121
-
until the end of life date.
121
+
until the end-of-life date.
122
122
123
-
After the year-month branch has reached end of life, the branch may be
123
+
After the year-month branch has reached end-of-life, the branch may be
124
124
deleted from the repository.
125
125
126
126
### Reporting security issues
127
127
128
128
The Docker maintainers take security seriously. If you discover a security
129
129
issue, please bring it to their attention right away!
130
130
131
-
Please DO NOT file a public issue, instead send your report privately
131
+
Please DO NOT file a public issue; instead send your report privately
0 commit comments