Skip to content

Commit b0b1eb5

Browse files
authored
Merge pull request #229 from czka/master
A bunch of typos spotted.
2 parents a4f4f01 + 97f2d8f commit b0b1eb5

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ docker-gen within a container to do service registration with etcd.
5151
#### Separate Container Install
5252

5353
It can also be run as two separate containers using the [jwilder/docker-gen](https://index.docker.io/u/jwilder/docker-gen/)
54-
image virtually any other image.
54+
image, together with virtually any other image.
5555

5656
This is how you could run the official [nginx](https://registry.hub.docker.com/_/nginx/) image and
57-
have dockgen-gen generate a reverse proxy config in the same way that `nginx-proxy` works. You may want to do
58-
this to prevent having the docker socket bound to an publicly exposed container service.
57+
have docker-gen generate a reverse proxy config in the same way that `nginx-proxy` works. You may want to do
58+
this to prevent having the docker socket bound to a publicly exposed container service.
5959

6060
Start nginx with a shared volume:
6161

@@ -96,7 +96,7 @@ Options:
9696
-notify-output
9797
log the output(stdout/stderr) of notify command
9898
-notify-sighup docker kill -s HUP container-ID
99-
send HUP signal to container. Equivalent to docker kill -s HUP container-ID
99+
send HUP signal to container. Equivalent to docker kill -s HUP container-ID
100100
-only-exposed
101101
only include containers with exposed ports
102102
-only-published
@@ -120,20 +120,20 @@ Options:
120120
121121
Arguments:
122122
template - path to a template to generate
123-
dest - path to a write the template. If not specfied, STDOUT is used
123+
dest - path to a write the template. If not specfied, STDOUT is used
124124
125125
Environment Variables:
126126
DOCKER_HOST - default value for -endpoint
127127
DOCKER_CERT_PATH - directory path containing key.pem, cert.pm and ca.pem
128128
DOCKER_TLS_VERIFY - enable client TLS verification]
129129
```
130130

131-
If no `<dest>` file is specified, the output is sent to stdout. Mainly useful for debugging.
131+
If no `<dest>` file is specified, the output is sent to stdout. Mainly useful for debugging.
132132

133133

134134
### Configuration file
135135

136-
Using the -config flag from above you can tell docker-gen to use the specified config file instead of command-line options. Multiple templates can be defined and they will be executed in the order that they appear in the config file.
136+
Using the -config flag from above you can tell docker-gen to use the specified config file instead of command-line options. Multiple templates can be defined and they will be executed in the order that they appear in the config file.
137137

138138
An example configuration file, **docker-gen.cfg** can be found in the examples folder.
139139

@@ -191,7 +191,7 @@ wait = "500ms:2s"
191191
192192
[config.NotifyContainers]
193193
nginx = 1 # 1 is a signal number to be sent; here SIGHUP
194-
e75a60548dc9 = 1 # a key can be either container name (nginx) or ID
194+
e75a60548dc9 = 1 # a key can be either container name (nginx) or ID
195195
```
196196

197197
===
@@ -413,7 +413,7 @@ $ docker-gen -only-published -watch -notify "/etc/init.d/nginx reload" templates
413413

414414
#### Fluentd Log Management
415415

416-
This template generate a fluentd.conf file used by fluentd. It would then ships log files off
416+
This template generate a fluentd.conf file used by fluentd. It would then ship log files off
417417
the host.
418418

419419
```
@@ -423,8 +423,8 @@ $ docker-gen -watch -notify "restart fluentd" templates/fluentd.tmpl /etc/fluent
423423
#### Service Discovery in Etcd
424424

425425

426-
This template is an example of generating a script that is then executed. This template generates
427-
a python script that is then executed which register containers in Etcd using it's HTTP API.
426+
This template is an example of generating a script that is then executed. This template generates
427+
a python script that is then executed which register containers in Etcd using its HTTP API.
428428

429429
```
430430
$ docker-gen -notify "/bin/bash /tmp/etcd.sh" -interval 10 templates/etcd.tmpl /tmp/etcd.sh

0 commit comments

Comments
 (0)