fix(docs): fixup based on changes in master

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
This commit is contained in:
Brandon Philips 2014-01-21 12:47:27 -08:00 committed by Tibor Vass
parent c046828392
commit a25ce61e87
1 changed files with 3 additions and 1 deletions

View File

@ -27,7 +27,7 @@ To list available commands, either run ``docker`` with no parameters or execute
Usage of docker: Usage of docker:
-D, --debug=false: Enable debug mode -D, --debug=false: Enable debug mode
-H, --host=[]: Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise -H, --host=[]: Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise. systemd socket activation can be used with fd://[socketfd].
--api-enable-cors=false: Enable CORS headers in the remote API --api-enable-cors=false: Enable CORS headers in the remote API
-b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
--bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b --bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b
@ -63,6 +63,8 @@ the ``-H`` flag for the client.
# both are equal # both are equal
To run the daemon with socket activation, use ``docker -d -H fd://*``. Individual sockets can also be specified ``docker -d -H fd://3``.
.. _cli_attach: .. _cli_attach:
``attach`` ``attach``