Skip to content

Commit 45542d7

Browse files
author
Tammy Fox
authored
editorial review
1 parent 5d51957 commit 45542d7

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

install/index.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ repositories [Docker Engine](https://github.com/docker/engine) and
3535

3636
Releases of Docker Engine and Docker Client for general availability
3737
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
3939
year-month release. The version numbering format is chosen to illustrate
4040
cadence and does not guarantee SemVer, but the desired date for general
4141
availability. The version number may have additional information, such as
@@ -44,21 +44,21 @@ beta and release candidate qualifications. Such releases are considered
4444

4545
The cadence of the year-month releases is every 6 months starting with
4646
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.
4848

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>
5050
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
5252
release channels are available for each of the year-month releases and
5353
allow users to "pin" on a year-month release of choice. The release
5454
channel also receives patch releases when they become available.
5555

5656
### Nightly builds
5757

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
5959
number for nightly builds take the format `0.YYYYmmdd.HHMMSS`,
6060
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
6262
for the nightly builds.
6363

6464
The release channel for these builds is called `nightly`.
@@ -67,21 +67,21 @@ The release channel for these builds is called `nightly`.
6767

6868
In preparation for a new year-month release, a branch is created from
6969
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
7373
from within the corresponding release branch.
7474

7575
While pre-releases are done to assist in the stabilization process, no
7676
guarantees are provided.
7777

7878
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`,
8080
for example `test-18.09`.
8181

8282
### General availability
8383

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
8585
branch. The branch is created with format `<year>.<month>`, for example
8686
`18.09`. The year-month name indicates the earliest possible calendar
8787
month to expect the release to be generally available. All further patch
@@ -96,14 +96,14 @@ test channel.
9696

9797
For a given year-month release, Docker releases both CE and EE
9898
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
100100
as well as private repositories for the EE code. Automation (a bot)
101101
is used to keep the branches between CE and EE in sync so as features
102102
and fixes are merged on the various branches in the CE repositories
103103
(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
105105
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.
107107

108108
## Next release
109109

@@ -118,22 +118,22 @@ release. Docker EE releases are supported for 24 months after the first
118118
year-month general availability release.
119119

120120
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.
122122

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
124124
deleted from the repository.
125125

126126
### Reporting security issues
127127

128128
The Docker maintainers take security seriously. If you discover a security
129129
issue, please bring it to their attention right away!
130130

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
132132
133133

134-
Security reports are greatly appreciated and we will publicly thank you
135-
for it. We also like to send giftsif you're into schwag, make sure to
136-
let us know. We currently do not offer a paid security bounty program,
134+
Security reports are greatly appreciated, and Docker will publicly thank you
135+
for it. Docker also likes to send giftsif you're into swag, make sure to
136+
let us know. Docker currently does not offer a paid security bounty program
137137
but are not ruling it out in the future.
138138

139139
### Supported platforms
@@ -176,18 +176,18 @@ or by adding a comment to the PR.
176176

177177
Patch releases are always backward compatible with its year-month version.
178178

179-
## Not Covered
179+
## Not covered
180180

181181
As a general rule, anything not mentioned in this document may change in any release.
182182

183183
## Exceptions
184184

185185
Exceptions are made in the interest of __security patches__. If a break
186186
in release procedure or product functionality is required, it will
187-
be communicated clearly and the solution will be considered against
187+
be communicated clearly, and the solution will be considered against
188188
total impact.
189189

190190
## Get started
191191

192-
After setting up Docker, you can learn the basics over at
192+
After setting up Docker, you can learn the basics with
193193
[Getting started with Docker](/get-started/).

0 commit comments

Comments
 (0)