Skip to content

Commit 06e7137

Browse files
umarfchymilas
andauthored
docs: fix grammatical issues (docker#9997)
Signed-off-by: Umar Chowdhury <[email protected]> Co-authored-by: Milas Bowman <[email protected]>
1 parent fb5b90e commit 06e7137

14 files changed

+51
-51
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
**Related issue**
44
<!-- If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" -->
55

6-
**(not mandatory) A picture of a cute animal, if possible in relation with what you did**
6+
**(not mandatory) A picture of a cute animal, if possible in relation to what you did**

BUILDING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ make test
3636
If you need to update a golden file simply do `go test ./... -test.update-golden`.
3737

3838
### End-to-end tests
39-
To run e2e tests, the Compose CLI binary need to be build. All the commands to run e2e tests propose a version
39+
To run e2e tests, the Compose CLI binary needs to be built. All the commands to run e2e tests propose a version
4040
with the prefix `build-and-e2e` to first build the CLI before executing tests.
4141

4242
Note that this requires a local Docker Engine to be running.
@@ -84,8 +84,8 @@ make build-and-e2e-compose-standalone
8484
## Releases
8585

8686
To create a new release:
87-
* Check that the CI is green on the main branch for commit you want to release
88-
* Run the release Github Actions workflow with a tag of the form vx.y.z following existing tags.
87+
* Check that the CI is green on the main branch for the commit you want to release
88+
* Run the release Github Actions workflow with a tag of form vx.y.z following existing tags.
8989

9090
This will automatically create a new tag, release and make binaries for
9191
Windows, macOS, and Linux available for download on the

CONTRIBUTING.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ start participating.
2222
The Docker maintainers take security seriously. If you discover a security
2323
issue, please bring it to their attention right away!
2424

25-
Please **DO NOT** file a public issue, instead send your report privately to
25+
Please **DO NOT** file a public issue, instead, send your report privately to
2626
2727

28-
Security reports are greatly appreciated and we will publicly thank you for it.
28+
Security reports are greatly appreciated and we will publicly thank you for them.
2929
We also like to send gifts&mdash;if you're into Docker swag, make sure to let
30-
us know. We currently do not offer a paid security bounty program, but are not
30+
us know. We currently do not offer a paid security bounty program but are not
3131
ruling it out in the future.
3232

3333

@@ -39,19 +39,19 @@ and will thank you for it!
3939

4040
Check that [our issue database](https://github.com/docker/compose/labels/Docker%20Compose%20V2)
4141
doesn't already include that problem or suggestion before submitting an issue.
42-
If you find a match, you can use the "subscribe" button to get notified on
42+
If you find a match, you can use the "subscribe" button to get notified of
4343
updates. Do *not* leave random "+1" or "I have this too" comments, as they
4444
only clutter the discussion, and don't help to resolve it. However, if you
4545
have ways to reproduce the issue or have additional information that may help
46-
resolving the issue, please leave a comment.
46+
resolve the issue, please leave a comment.
4747

4848
When reporting issues, always include:
4949

5050
* The output of `docker version`.
5151
* The output of `docker context show`.
5252
* The output of `docker info`.
5353

54-
Also include the steps required to reproduce the problem if possible and
54+
Also, include the steps required to reproduce the problem if possible and
5555
applicable. This information will help us review and fix your issue faster.
5656
When sending lengthy log files, consider posting them as a gist
5757
(https://gist.github.com).
@@ -124,7 +124,7 @@ Fork the repository and make changes on your fork in a feature branch:
124124
issue.
125125

126126
Submit unit tests for your changes. Go has a great test framework built in; use
127-
it! Take a look at existing tests for inspiration. Also end-to-end tests are
127+
it! Take a look at existing tests for inspiration. Also, end-to-end tests are
128128
available. Run the full test suite, both unit tests and e2e tests on your
129129
branch before submitting a pull request. See [BUILDING.md](BUILDING.md) for
130130
instructions to build and run tests.
@@ -145,7 +145,7 @@ suggested modifications and push additional commits to your feature branch. Post
145145
a comment after pushing. New commits show up in the pull request automatically,
146146
but the reviewers are notified only when you comment.
147147

148-
Pull requests must be cleanly rebased on top of master without multiple branches
148+
Pull requests must be cleanly rebased on top of the base branch without multiple branches
149149
mixed into the PR.
150150

151151
**Git tip**: If your PR no longer merges cleanly, use `rebase master` in your
@@ -165,7 +165,7 @@ changes in the same pull request so that a revert would remove all traces of
165165
the feature or fix.
166166

167167
Include an issue reference like `Closes #XXXX` or `Fixes #XXXX` in the pull
168-
request description that close an issue. Including references automatically
168+
request description that closes an issue. Including references automatically
169169
closes the issue on a merge.
170170

171171
Please do not add yourself to the `AUTHORS` file, as it is regenerated regularly
@@ -256,7 +256,7 @@ your help to keep it that way. To help with this we've come up with some general
256256
guidelines for the community as a whole:
257257

258258
* Be nice: Be courteous, respectful and polite to fellow community members:
259-
no regional, racial, gender, or other abuse will be tolerated. We like
259+
no regional, racial, gender or other abuse will be tolerated. We like
260260
nice people way better than mean ones!
261261

262262
* Encourage diversity and participation: Make everyone in our community feel
@@ -270,10 +270,10 @@ guidelines for the community as a whole:
270270

271271
* Stay on topic: Make sure that you are posting to the correct channel and
272272
avoid off-topic discussions. Remember when you update an issue or respond
273-
to an email you are potentially sending to a large number of people. Please
274-
consider this before you update. Also remember that nobody likes spam.
273+
to an email you are potentially sending it to a large number of people. Please
274+
consider this before you update. Also, remember that nobody likes spam.
275275

276-
* Don't send email to the maintainers: There's no need to send email to the
276+
* Don't send emails to the maintainers: There's no need to send emails to the
277277
maintainers to ask them to investigate an issue or to take a look at a
278278
pull request. Instead of sending an email, GitHub mentions should be
279279
used to ping maintainers to review a pull request, a proposal or an
@@ -287,7 +287,7 @@ to result in a solid, consistent codebase.
287287

288288
It is possible that the code base does not currently comply with these
289289
guidelines. We are not looking for a massive PR that fixes this, since that
290-
goes against the spirit of the guidelines. All new contributions should make a
290+
goes against the spirit of the guidelines. All new contributors should make their
291291
best effort to clean up and make the code base better than they left it.
292292
Obviously, apply your best judgement. Remember, the goal here is to make the
293293
code base easier for humans to navigate and understand. Always keep that in
@@ -301,7 +301,7 @@ The rules:
301301
3. All code should follow the guidelines covered in [Effective
302302
Go](http://golang.org/doc/effective_go.html) and [Go Code Review
303303
Comments](https://github.com/golang/go/wiki/CodeReviewComments).
304-
4. Comment the code. Tell us the why, the history and the context.
304+
4. Include code comments. Tell us the why, the history and the context.
305305
5. Document _all_ declarations and methods, even private ones. Declare
306306
expectations, caveats and anything else that may be important. If a type
307307
gets exported, having the comments already there will ensure it's ready.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
Docker Compose is a tool for running multi-container applications on Docker
1212
defined using the [Compose file format](https://compose-spec.io).
13-
A Compose file is used to define how the one or more containers that make up
13+
A Compose file is used to define how one or more containers that make up
1414
your application are configured.
1515
Once you have a Compose file, you can create and start your application with a
1616
single command: `docker compose up`.
@@ -47,7 +47,7 @@ Or copy it into one of these folders to install it system-wide:
4747
Quick Start
4848
-----------
4949

50-
Using Docker Compose is basically a three-step process:
50+
Using Docker Compose is a three-step process:
5151
1. Define your app's environment with a `Dockerfile` so it can be
5252
reproduced anywhere.
5353
2. Define the services that make up your app in `docker-compose.yml` so

docs/reference/compose.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Docker Compose
5555
You can use compose subcommand, `docker compose [-f <arg>...] [options] [COMMAND] [ARGS...]`, to build and manage
5656
multiple services in Docker containers.
5757

58-
### Use `-f` to specify name and path of one or more Compose files
58+
### Use `-f` to specify the name and path of one or more Compose files
5959
Use the `-f` flag to specify the location of a Compose configuration file.
6060

6161
#### Specifying multiple Compose files
@@ -118,8 +118,8 @@ Each configuration has a project name. If you supply a `-p` flag, you can specif
118118
specify the flag, Compose uses the current directory name.
119119
Project name can also be set by `COMPOSE_PROJECT_NAME` environment variable.
120120

121-
Most compose subcommand can be ran without a compose file, just passing
122-
project name to retrieve the relevant resources.
121+
Many Compose subcommands can be run without a Compose file by passing
122+
the project name.
123123

124124
```console
125125
$ docker compose -p my_project ps -a
@@ -145,10 +145,10 @@ Profiles can also be set by `COMPOSE_PROFILES` environment variable.
145145
You can set environment variables for various docker compose options, including the `-f`, `-p` and `--profiles` flags.
146146

147147
Setting the `COMPOSE_FILE` environment variable is equivalent to passing the `-f` flag,
148-
`COMPOSE_PROJECT_NAME` environment variable does the same for to the `-p` flag,
149-
and so does `COMPOSE_PROFILES` environment variable for to the `--profiles` flag.
148+
`COMPOSE_PROJECT_NAME` environment variable does the same as the `-p` flag,
149+
and `COMPOSE_PROFILES` environment variable is equivalent to the `--profiles` flag.
150150

151-
If flags are explicitly set on command line, associated environment variable is ignored
151+
If flags are explicitly set on the command line, the associated environment variable is ignored.
152152

153153
Setting the `COMPOSE_IGNORE_ORPHANS` environment variable to `true` will stop docker compose from detecting orphaned
154154
containers for the project.

docs/reference/compose_convert.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Converts the compose file to platform's canonical format
2929

3030
## Description
3131

32-
`docker compose convert` render the actual data model to be applied on target platform. When used with Docker engine,
33-
it merges the Compose files set by `-f` flags, resolves variables in Compose file, and expands short-notation into
34-
fully defined Compose model.
32+
`docker compose convert` renders the actual data model to be applied on the target platform. When used with the Docker engine,
33+
it merges the Compose files set by `-f` flags, resolves variables in the Compose file, and expands short-notation into
34+
the canonical format.
3535

3636
To allow smooth migration from docker-compose, this subcommand declares alias `docker compose config`

docs/reference/compose_exec.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ Execute a command in a running container.
2222

2323
This is the equivalent of `docker exec` targeting a Compose service.
2424

25-
With this subcommand you can run arbitrary commands in your services. Commands are by default allocating a TTY, so
25+
With this subcommand, you can run arbitrary commands in your services. Commands allocate a TTY by default, so
2626
you can use a command such as `docker compose exec web sh` to get an interactive prompt.

docs/reference/compose_ls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ List running compose projects
1717

1818
## Description
1919

20-
List Compose projects running on platform.
20+
Lists running Compose projects.

docs/reference/compose_ps.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ example-foo-1 "/docker-entrypoint.…" foo running 0.0.0.0:8080->8
3535

3636
By default, the `docker compose ps` command uses a table ("pretty") format to
3737
show the containers. The `--format` flag allows you to specify alternative
38-
presentations for the output. Currently supported options are `pretty` (default),
38+
presentations for the output. Currently, supported options are `pretty` (default),
3939
and `json`, which outputs information about the containers as a JSON array:
4040

4141
```console
@@ -85,7 +85,7 @@ $ docker compose ps --format json | jq .
8585
### <a name="status"></a> Filter containers by status (--status)
8686

8787
Use the `--status` flag to filter the list of containers by status. For example,
88-
to show only containers that are running, or only containers that have exited:
88+
to show only containers that are running or only containers that have exited:
8989

9090
```console
9191
$ docker compose ps --status=running
@@ -99,7 +99,7 @@ example-bar-1 "/docker-entrypoint.…" bar exited (0)
9999

100100
### <a name="filter"></a> Filter containers by status (--filter)
101101

102-
The [`--status` flag](#status) is a convenience shorthand for the `--filter status=<status>`
102+
The [`--status` flag](#status) is a convenient shorthand for the `--filter status=<status>`
103103
flag. The example below is the equivalent to the example from the previous section,
104104
this time using the `--filter` flag:
105105

@@ -114,4 +114,4 @@ example-bar-1 "/docker-entrypoint.…" bar exited (0)
114114
```
115115

116116
The `docker compose ps` command currently only supports the `--filter status=<status>`
117-
option, but additional filter options may be added in future.
117+
option, but additional filter options may be added in the future.

docs/reference/docker_compose.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ long: |-
44
You can use compose subcommand, `docker compose [-f <arg>...] [options] [COMMAND] [ARGS...]`, to build and manage
55
multiple services in Docker containers.
66
7-
### Use `-f` to specify name and path of one or more Compose files
7+
### Use `-f` to specify the name and path of one or more Compose files
88
Use the `-f` flag to specify the location of a Compose configuration file.
99
1010
#### Specifying multiple Compose files
@@ -67,8 +67,8 @@ long: |-
6767
specify the flag, Compose uses the current directory name.
6868
Project name can also be set by `COMPOSE_PROJECT_NAME` environment variable.
6969
70-
Most compose subcommand can be ran without a compose file, just passing
71-
project name to retrieve the relevant resources.
70+
Many Compose subcommands can be run without a Compose file by passing
71+
the project name.
7272
7373
```console
7474
$ docker compose -p my_project ps -a
@@ -94,10 +94,10 @@ long: |-
9494
You can set environment variables for various docker compose options, including the `-f`, `-p` and `--profiles` flags.
9595
9696
Setting the `COMPOSE_FILE` environment variable is equivalent to passing the `-f` flag,
97-
`COMPOSE_PROJECT_NAME` environment variable does the same for to the `-p` flag,
98-
and so does `COMPOSE_PROFILES` environment variable for to the `--profiles` flag.
97+
`COMPOSE_PROJECT_NAME` environment variable does the same as the `-p` flag,
98+
and `COMPOSE_PROFILES` environment variable is equivalent to the `--profiles` flag.
9999
100-
If flags are explicitly set on command line, associated environment variable is ignored
100+
If flags are explicitly set on the command line, the associated environment variable is ignored.
101101
102102
Setting the `COMPOSE_IGNORE_ORPHANS` environment variable to `true` will stop docker compose from detecting orphaned
103103
containers for the project.

0 commit comments

Comments
 (0)