Skip to content

Commit

Permalink
Merge pull request docker-archive#2180 from ogryzek/typo-edits
Browse files Browse the repository at this point in the history
Edit typos in 'Try Swarm at scale'
(cherry picked from commit 5925814)

Signed-off-by: Sven Dowideit <[email protected]>
  • Loading branch information
dongluochen authored and SvenDowideit committed May 11, 2016
1 parent 22337dc commit 601b219
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
6 changes: 3 additions & 3 deletions docs/swarm_at_scale/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ shows the appliation's high level architecture:
![](../images/app-architecture.png)

All the servers are running Docker Engine. The entire application is fully
"dockerized" in that all services are running inside of containers.
"Dockerized" in that all services are running inside of containers.

The frontend consists of an load balancer with *N* frontend instances. Each
The frontend consists of a load balancer with *N* frontend instances. Each
frontend consists of a web server and a Redis queue. The load balancer can
handle an arbitrary number of web containers behind it (`frontend01`-
`frontendN`). The web containers run a simple Python application that takes a
Expand All @@ -56,7 +56,7 @@ Behind the frontend is a worker tier which runs on separate nodes. This tier:
Just like the frontend, the worker tier can also scale arbitrarily. The worker
count and frontend count are independent from each other.

The applications dockerized microservices are deployed to a container network.
The application's Dockerized microservices are deployed to a container network.
Container networks are a feature of Docker Engine that allows communication
between multiple containers across multiple Docker hosts.

Expand Down
6 changes: 3 additions & 3 deletions docs/swarm_at_scale/deploy-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ weight=-80

You've [deployed the load balancer, the discovery backend, and a Swarm
cluster](deploy-infra.md) so now you can build and deploy the voting application
itself. You do this by starting a number of "dockerized applications" running in
itself. You do this by starting a number of "Dockerized applications" running in
containers.

The diagram below shows the final application configuration including the overlay
Expand All @@ -33,7 +33,7 @@ This application relies on both an overlay container network and a container
volume. The Docker Engine provides these two features. You'll create them both
on the Swarm `manager` instance.

1. Direct your local environmen to the Swarm manager host.
1. Direct your local environment to the Swarm manager host.

```bash
$ eval $(docker-machine env manager)
Expand Down Expand Up @@ -139,7 +139,7 @@ command below, look for the value constraint.
--name results-app docker/example-voting-app-result-app
```

7. Start voting application twice, on each frontend node.
7. Start the voting application twice; once on each frontend node.

```bash
$ docker -H $(docker-machine ip manager):3376 run -t -d \
Expand Down
19 changes: 10 additions & 9 deletions docs/swarm_at_scale/deploy-infra.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ support the container network you'll create later.
## Task 3. Add the load balancer
The application uses an <a
href="https://github.com/ehazlett/interlock">Interlock</a> and an Nginx as a
The application uses <a
href="https://github.com/ehazlett/interlock">Interlock</a> and Nginx as a
loadblancer. Before you build the load balancer host, you'll create the
cnofiguration you'll use for Nginx.
configuration you'll use for Nginx.
1. On your local host, create a `config` diretory.
2. Change to `config` directory.
1. On your local host, create a `config` directory.
2. Change directories to the `config` directory.
```bash
$ cd config
Expand All @@ -191,7 +191,7 @@ cnofiguration you'll use for Nginx.
192.168.99.101
```
5. Use your favorte editor to create a `config.toml` file and add this content
5. Use your favorite editor to create a `config.toml` file and add this content
to the file:
```json
Expand Down Expand Up @@ -294,12 +294,13 @@ node. Here, the task is to create each virtual host for each node. There are
three commands required:
* create the host with Docker Machine
* point the local environmnet to the new host
* point the local environment to the new host
* join the host to the Swarm cluster
If you were building this in a non-Mac/Windows environment, you'd only need to
run the `join` command to add node to Swarm and registers it with the Consul
discovery service. When you create a node, you'll label it also, for example:
run the `join` command to add a node to the Swarm cluster and register it with
the Consul discovery service. When you create a node, you also give it a label,
for example:

```
--engine-opt="label=com.function=frontend01"
Expand Down
8 changes: 4 additions & 4 deletions docs/swarm_at_scale/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Docker Compose file. You (or others) can use the file to deploy and scale the
application further. The article also provides a troubleshooting section you can
use while developing or deploying the voting application.

The sample is written for a novice network administrator. You should have a
basic skills on Linux systems and `ssh` experience. Some knowledge of Git is
also useful but not strictly required. This example takes approximately an hour
to complete and has the following steps:
The sample is written for a novice network administrator. You should have basic
skills on Linux systems and `ssh` experience. Some knowledge of Git is also
useful but not strictly required. This example takes approximately an hour to
complete and has the following steps:

- [Learn the application architecture](about.md)
- [Deploy your infrastructure](deploy-infra.md)
Expand Down

0 comments on commit 601b219

Please sign in to comment.