diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index aec2a0776d..aac56681bf 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -477,15 +477,15 @@ please check the [run](run.md) reference. IP masquerading uses address translation to allow containers without a public IP to talk to other machines on the Internet. This may interfere with some -network topologies and can be disabled with --ip-masq=false. +network topologies and can be disabled with `--ip-masq=false`. Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be set like this: - DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/boot2docker/docker.log 2>&1 + DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1 # or export DOCKER_TMPDIR=/mnt/disk2/tmp - /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/boot2docker/docker.log 2>&1 + /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1 diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md index 1e2f2884b5..6f5c186d27 100644 --- a/docs/reference/glossary.md +++ b/docs/reference/glossary.md @@ -22,11 +22,7 @@ Docker supports as a storage backend. It implements the ## boot2docker [boot2docker](http://boot2docker.io/) is a lightweight Linux distribution made -specifically to run Docker containers. It is a common choice for a [VM](#virtual-machine) -to run Docker on Windows and Mac OS X. - -boot2docker can also refer to the boot2docker management tool on Windows and -Mac OS X which manages the boot2docker VM. +specifically to run Docker containers. The boot2docker management tool for Mac and Windows was deprecated and replaced by [`docker-machine`](#machine) which you can install with the Docker Toolbox. ## btrfs @@ -188,6 +184,11 @@ tags are how various images in a repository are distinguished from each other. *Note : This label is not related to the key=value labels set for docker daemon* +## Toolbox + +Docker Toolbox is the installer for Mac and Windows users. + + ## Union file system Union file systems, or UnionFS, are file systems that operate by creating layers, making them