diff --git a/compose/compose-file.md b/compose/compose-file.md index 2ec5f262dc..c2d33b2348 100644 --- a/compose/compose-file.md +++ b/compose/compose-file.md @@ -808,7 +808,7 @@ an error if it doesn't exist. `external` cannot be used in conjunction with other volume configuration keys (`driver`, `driver_opts`). -In the example below, instead of attemping to create a volume called +In the example below, instead of attempting to create a volume called `[projectname]_data`, Compose will look for an existing volume simply called `data` and mount it into the `db` service's containers. @@ -898,7 +898,7 @@ an error if it doesn't exist. (`driver`, `driver_opts`, `ipam`). In the example below, `proxy` is the gateway to the outside world. Instead of -attemping to create a network called `[projectname]_outside`, Compose will +attempting to create a network called `[projectname]_outside`, Compose will look for an existing network simply called `outside` and connect the `proxy` service's containers to it. diff --git a/compose/networking.md b/compose/networking.md index 9f83cf9aa1..6153d65a0e 100644 --- a/compose/networking.md +++ b/compose/networking.md @@ -150,4 +150,4 @@ If you want your containers to join a pre-existing network, use the [`external` external: name: my-pre-existing-network -Instead of attemping to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it. +Instead of attempting to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it. diff --git a/cs-engine/release-notes/release-notes.md b/cs-engine/release-notes/release-notes.md index b145809743..ea5b7097e8 100644 --- a/cs-engine/release-notes/release-notes.md +++ b/cs-engine/release-notes/release-notes.md @@ -83,7 +83,7 @@ This release addresses the following issues: [#22947](https://github.com/docker/docker/pull/22947) * Fix a possible deadlock on image deletion and container attach [#22918](https://github.com/docker/docker/pull/22918) -* Fix an issue causing `docker ps` to hange when using devicemapper +* Fix an issue causing `docker ps` to hang when using devicemapper [#22168](https://github.com/docker/docker/pull/22168) * Fix a bug preventing to `docker exec` into a container when using devicemapper [#22168](https://github.com/docker/docker/pull/22168) diff --git a/docker-cloud/apps/deploy-to-cloud-btn.md b/docker-cloud/apps/deploy-to-cloud-btn.md index b3ddb07295..2ce54cd391 100644 --- a/docker-cloud/apps/deploy-to-cloud-btn.md +++ b/docker-cloud/apps/deploy-to-cloud-btn.md @@ -30,7 +30,7 @@ The user can still modify the stack definition before deployment. ## Adding the 'Deploy to Docker Cloud' button in GitHub -You can simply add the following snipet to your `README.md` file: +You can simply add the following snippet to your `README.md` file: ```md [](https://cloud.docker.com/stack/deploy/) diff --git a/docker-cloud/apps/service-links.md b/docker-cloud/apps/service-links.md index 111d3f7b1d..b04ceaea55 100644 --- a/docker-cloud/apps/service-links.md +++ b/docker-cloud/apps/service-links.md @@ -59,11 +59,11 @@ Docker Cloud's service linking is modeled on [Docker Compose links](https://docs When you link a "client" service to a "server" service, Docker Cloud performs the following actions on the "client" service: -1. Creates a group of environment variables that contian information about the exposed ports of the "server" service, including its IP address, port and protocol. +1. Creates a group of environment variables that contain information about the exposed ports of the "server" service, including its IP address, port and protocol. 2. Copies all of the "server" service environment variables to the "client" service with an `HOSTNAME_ENV_` prefix. 3. Adds a DNS hostname to the Docker Cloud DNS service that resolves to the "server" service IP address. -Some environment variables such as the API endpoint are updated when a serivce scales up or down. Service links are only updated when a service is deployed or redeployed, but are not updated during runtime. No new service link environment variables are created when a service scales up or down. +Some environment variables such as the API endpoint are updated when a service scales up or down. Service links are only updated when a service is deployed or redeployed, but are not updated during runtime. No new service link environment variables are created when a service scales up or down. ### Service link example @@ -77,7 +77,7 @@ Imagine that you are running a web service (`my-web-app`) with 2 containers (`my Several environment variables are set on each container at startup to provide link details to other containers. The links created are directional. These are similar to those used by Docker Compose. -For our example app above, the following enviroment variables are set in the proxy containers to provide service links. The example proxy application can use these environment variables to configure itself on startup, and start balancing traffic between the two containers of `my-web-app`. +For our example app above, the following environment variables are set in the proxy containers to provide service links. The example proxy application can use these environment variables to configure itself on startup, and start balancing traffic between the two containers of `my-web-app`. | Name | Value | |:------------------------|:----------------------| diff --git a/docker-cloud/apps/service-redeploy.md b/docker-cloud/apps/service-redeploy.md index b040dea651..20397b7c94 100644 --- a/docker-cloud/apps/service-redeploy.md +++ b/docker-cloud/apps/service-redeploy.md @@ -78,4 +78,4 @@ whenever a new image is pushed. See the [Autoredeploy documentation](auto-redepl ## Redeploy a service using webhooks You can also use **triggers** to redeploy a service, for example when its image -is pushed or rebuilt in a third-party registry. See the [Triggers documentaiton](triggers.md) to learn more. +is pushed or rebuilt in a third-party registry. See the [Triggers documentation](triggers.md) to learn more. diff --git a/docker-cloud/apps/stack-yaml-reference.md b/docker-cloud/apps/stack-yaml-reference.md index 47ff06e3ba..76251dd79a 100644 --- a/docker-cloud/apps/stack-yaml-reference.md +++ b/docker-cloud/apps/stack-yaml-reference.md @@ -241,7 +241,7 @@ restart: always ``` ## roles -A list of Docker Cloud API roles to grant the service. The only supported value is `global`, which creates an environment variable `DOCKERCLOUD_AUTH` used to authenticate againts Docker Cloud API. Learn more [here](api-roles.md). +A list of Docker Cloud API roles to grant the service. The only supported value is `global`, which creates an environment variable `DOCKERCLOUD_AUTH` used to authenticate against Docker Cloud API. Learn more [here](api-roles.md). ```yml roles: diff --git a/docker-cloud/getting-started/deploy-app/11_service_stacks.md b/docker-cloud/getting-started/deploy-app/11_service_stacks.md index ad953e83a6..97d1678fe6 100644 --- a/docker-cloud/getting-started/deploy-app/11_service_stacks.md +++ b/docker-cloud/getting-started/deploy-app/11_service_stacks.md @@ -24,7 +24,7 @@ file that defines the three services (lb, web, redis) you created in the previous steps, including all modifications and environment variables. This is what the `docker-cloud.yml` file looks like. (If you are using the -quickstart-go version, you'll see `quickstart-go` indstead of +quickstart-go version, you'll see `quickstart-go` instead of `quickstart-python`.) ```yml diff --git a/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md b/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md index b1871bbe07..9581e5ebc7 100644 --- a/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md +++ b/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md @@ -37,7 +37,7 @@ fmt.Fprintf(w, "