docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update extends.md 

Just corrected a missing 'and'
This commit is contained in:
Joe Lemmer 2016-11-22 20:12:14 +00:00 committed by GitHub
parent 28d97648cc
commit 07fdd239c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/extends.md
View File

@ -267,7 +267,7 @@ common configuration:
## Adding and overriding configuration
Compose copies configurations from the original service over to the local one.
If a configuration option is defined in both the original service the local
If a configuration option is defined in both the original service and the local
service, the local value *replaces* or *extends* the original value.
For single-value options like `image`, `command` or `mem_limit`, the new value
@ -343,4 +343,4 @@ In the case of `environment`, `labels`, `volumes` and `devices`, Compose
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
- [Command line reference](./reference/index.md)
- [Compose file reference](compose-file.md)
- [Compose file reference](compose-file.md)