Merge pull request #1101 from alexwlchan/master

Fix a pair of typos in the docs
This commit is contained in:
Alexandre Beslic 2015-07-29 10:57:20 -07:00
commit 5f207e6fe9
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
# Using Docker Swarm and Mesos
Swarm comes with a built-in scheduler that works with the swarm manager to schedule container resources. You can completly replace the built-in scheduler with a 3rd party scheduler. For example, you can replace it with the Mesos scheduler as described here.
Swarm comes with a built-in scheduler that works with the swarm manager to schedule container resources. You can completely replace the built-in scheduler with a 3rd party scheduler. For example, you can replace it with the Mesos scheduler as described here.
When using Docker Swarm and Mesos, you use the Docker client to ask the swarm
manager to schedule containers. The swarm manager then schedules those

View File

@ -28,7 +28,7 @@ Alternatively, you can run integration tests directly on your host:
$ bats test/integration
```
In order to do that, you will need to setup a full development environmnet plus
In order to do that, you will need to setup a full development environment plus
[bats](https://github.com/sstephenson/bats#installing-bats-from-source)
> **Note**: There are known issues running the integration tests using