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

clarified Mac vs. Linux steps on bash completion (#3800) 

* clarified Mac vs. Linux steps on bash completion

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit on Compose file reference page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-07-03 16:26:54 -07:00 committed by GitHub
parent 69c619e4c3
commit d2b71ad555
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compose/completion.md
View File

@ -11,18 +11,21 @@ for the bash and zsh shell.
### Bash ### Bash
Make sure bash completion is installed. If you use a current Linux in a Make sure bash completion is installed.
non-minimal installation, bash completion should be available. On a Mac, install
with `brew install bash-completion`. * On a current Linux OS (in a non-minimal installation), bash completion should be
available.
* On a Mac, install with `brew install bash-completion`.
Place the completion script in `/etc/bash_completion.d/` Place the completion script in `/etc/bash_completion.d/`
(`/usr/local/etc/bash_completion.d/` on a Mac): (or `/usr/local/etc/bash_completion.d/` on a Mac):
```shell ```shell
curl -L https://raw.githubusercontent.com/docker/compose/master/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose curl -L https://raw.githubusercontent.com/docker/compose/master/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
``` ```
Then add the following to your `~/.bash_profile`: On a Mac, add the following to your `~/.bash_profile`:
```shell ```shell
if [ -f $(brew --prefix)/etc/bash_completion ]; then if [ -f $(brew --prefix)/etc/bash_completion ]; then

2
compose/compose-file/index.md
View File

@ -16,7 +16,7 @@ version.
## Compose and Docker compatibility matrix ## Compose and Docker compatibility matrix
There are several versions of the Compose file format – 1, 2, 2.x, and 3.x The There are several versions of the Compose file format – 1, 2, 2.x, and 3.x. The
table below is a quick look. For full details on what each version includes and table below is a quick look. For full details on what each version includes and
how to upgrade, see **[About versions and upgrading](compose-versioning.md)**. how to upgrade, see **[About versions and upgrading](compose-versioning.md)**.