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

Merge pull request #13612 from duglin/DocsNewLine 

Premature newline insertions
This commit is contained in:
James Turnbull 2015-05-30 08:33:46 -04:00
parent 04c6f09fbd e51b311129
commit 18c11dc264
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/sources/reference/commandline/cli.md
View File

@ -574,8 +574,8 @@ use the proxy
`--default-ulimit` allows you to set the default `ulimit` options to use for `--default-ulimit` allows you to set the default `ulimit` options to use for
all containers. It takes the same options as `--ulimit` for `docker run`. If all containers. It takes the same options as `--ulimit` for `docker run`. If
these defaults are not set, `ulimit` settings will be inherited, if not set on these defaults are not set, `ulimit` settings will be inherited, if not set on
`docker run`, from the Docker daemon. Any `--ulimit` options passed to `docker `docker run`, from the Docker daemon. Any `--ulimit` options passed to
run` will overwrite these defaults. `docker run` will overwrite these defaults.
### Miscellaneous options ### Miscellaneous options
@ -1029,8 +1029,8 @@ Creates a new container.
The `docker create` command creates a writeable container layer over the The `docker create` command creates a writeable container layer over the
specified image and prepares it for running the specified command. The specified image and prepares it for running the specified command. The
container ID is then printed to `STDOUT`. This is similar to `docker run -d` container ID is then printed to `STDOUT`. This is similar to `docker run -d`
except the container is never started. You can then use the `docker start except the container is never started. You can then use the
<container_id>` command to start the container at any point. `docker start <container_id>` command to start the container at any point.
This is useful when you want to set up a container configuration ahead of time This is useful when you want to set up a container configuration ahead of time
so that it is ready to start when you need it. so that it is ready to start when you need it.
@ -1125,8 +1125,8 @@ and Docker images will report:
#### Filtering #### Filtering
The filtering flag (`-f` or `--filter`) format is of "key=value". If you would The filtering flag (`-f` or `--filter`) format is of "key=value". If you would
like to use multiple filters, pass multiple flags (e.g., `--filter "foo=bar" like to use multiple filters, pass multiple flags (e.g.,
--filter "bif=baz"`) `--filter "foo=bar" --filter "bif=baz"`)
Using the same filter multiple times will be handled as a *OR*; for example Using the same filter multiple times will be handled as a *OR*; for example
`--filter container=588a23dac085 --filter container=a8f7720b8c22` will display `--filter container=588a23dac085 --filter container=a8f7720b8c22` will display
@ -1869,9 +1869,9 @@ The main process inside the container referenced under the link `/redis` will re
$ docker rm $(docker ps -a -q) $ docker rm $(docker ps -a -q)
This command will delete all stopped containers. The command `docker ps This command will delete all stopped containers. The command
-a -q` will return all existing container IDs and pass them to the `rm` `docker ps -a -q` will return all existing container IDs and pass them to
command which will delete them. Any running containers will not be the `rm` command which will delete them. Any running containers will not be
deleted. deleted.
## rmi ## rmi