diff --git a/MAINTAINERS b/MAINTAINERS index 93013e004d..81494a4d2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -111,7 +111,7 @@ # still stumble into him in our issue tracker, or on IRC. "erikh", - # Evan Hazlett is the creator of of the Shipyard and Interlock open source projects, + # Evan Hazlett is the creator of the Shipyard and Interlock open source projects, # and the author of "Orca", which became the foundation of Docker Universal Control # Plane (UCP). As a maintainer, Evan helped integrating SwarmKit (secrets, tasks) # into the Docker engine. diff --git a/api/swagger.yaml b/api/swagger.yaml index 6e0bc25b52..0e021fed66 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -3262,7 +3262,7 @@ definitions:


- - "ingress" makes the target port accessible on on every node, + - "ingress" makes the target port accessible on every node, regardless of whether there is a task for the service running on that node or not. - "host" bypasses the routing mesh and publish the port directly on diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index 566532583c..f6c41d5519 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -292,7 +292,7 @@ func (s *DockerSuite) TestRestartContainerwithRestartPolicy(c *check.C) { dockerCmd(c, "start", id1) dockerCmd(c, "start", id2) - // Kill the containers, making sure the are stopped at the end of the test + // Kill the containers, making sure they are stopped at the end of the test dockerCmd(c, "kill", id1) dockerCmd(c, "kill", id2) err = waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTimeout)