diff --git a/compose/compose-file.md b/compose/compose-file.md index c247b7dd09..0173b900db 100644 --- a/compose/compose-file.md +++ b/compose/compose-file.md @@ -503,7 +503,7 @@ Logging configuration for the service. The `driver` name specifies a logging driver for the service's containers, as with the ``--log-driver`` option for docker run -([documented here](/engine/reference/logging/overview.md)). +([documented here](/engine/admin/logging/overview.md)). The default value is json-file. @@ -787,7 +787,7 @@ use the specified driver. > Note: No path expansion will be done if you have also specified a > `volume_driver`. -See [Docker Volumes](/engine/userguide/dockervolumes.md) and +See [Docker Volumes](/engine/tutorials/dockervolumes.md) and [Volume Plugins](/engine/extend/plugins_volume.md) for more ### volumes_from diff --git a/compose/install.md b/compose/install.md index 0d30ec9341..9f9d4d6add 100644 --- a/compose/install.md +++ b/compose/install.md @@ -14,7 +14,7 @@ To install Compose, do the following: * Windows installation - * Ubuntu installation + * Ubuntu installation * other system installations diff --git a/compose/swarm.md b/compose/swarm.md index bfc47c819a..7467b43d8d 100644 --- a/compose/swarm.md +++ b/compose/swarm.md @@ -21,7 +21,7 @@ format](compose-file.md#versioning) you are using: - subject to the [limitations](swarm.md#limitations) described below, - - as long as the Swarm cluster is configured to use the [overlay driver](/engine/userguide/networking/dockernetworks/#an-overlay-network), + - as long as the Swarm cluster is configured to use the [overlay driver](/engine/userguide/networking/#an-overlay-network-with-docker-engine-swarm-mode), or a custom driver which supports multi-host networking. Read [Get started with multi-host networking](/engine/userguide/networking/get-started-overlay/) to see how to diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 289a3ab94f..37f08e3205 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -506,7 +506,7 @@ In that topic, see also: * [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file) -* [Windows configuration file](/reference/commandline/dockerd/#/windows-configuration-file) +* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file) Note that updating these settings requires a reconfiguration and reboot of the Linux VM. diff --git a/docker-hub/index.md b/docker-hub/index.md index d04a730d77..deb99aec1f 100644 --- a/docker-hub/index.md +++ b/docker-hub/index.md @@ -57,7 +57,7 @@ the repositories you can access and their status, view your "Dashboard" page on [Docker Hub](https://hub.docker.com). You can find more information on working with Docker images in the -[Docker userguide](/engine/userguide/dockerimages/). +[Docker userguide](/engine/tutorials/dockerimages/). ### Use Official Repositories diff --git a/docker-hub/repos.md b/docker-hub/repos.md index 6fe55f0fa6..a0014a0f02 100644 --- a/docker-hub/repos.md +++ b/docker-hub/repos.md @@ -95,7 +95,7 @@ You can name your local images either when you build it, using by re-tagging an existing local image `docker tag /[:]`, or by using `docker commit /[:]` to commit changes. -See [Working with Docker images](/engine/userguide/dockerimages) for a detailed description. +See [Working with Docker images](/engine/tutorials/dockerimages/) for a detailed description. Now you can push this repository to the registry designated by its name or tag. diff --git a/engine/faq.md b/engine/faq.md index 9a364fff69..9468e0d9b9 100644 --- a/engine/faq.md +++ b/engine/faq.md @@ -155,7 +155,7 @@ Linux: - Any distribution running version 3.10+ of the Linux kernel - Specific instructions are available for most Linux distributions, including [RHEL](installation/linux/rhel.md), [Ubuntu](installation/linux/ubuntulinux.md), - [SuSE](installation/linux/suse.md), and many others. + [SuSE](installation/linux/SUSE.md), and many others. Microsoft Windows: - Windows Server 2016 @@ -288,4 +288,4 @@ You can find more answers on: - [Ask questions on Stackoverflow](http://stackoverflow.com/search?q=docker) - [Join the conversation on Twitter](http://twitter.com/docker) -Looking for something else to read? Checkout the [User Guide](userguide/index.md). \ No newline at end of file +Looking for something else to read? Checkout the [User Guide](userguide/index.md). diff --git a/engine/userguide/storagedriver/device-mapper-driver.md b/engine/userguide/storagedriver/device-mapper-driver.md index 9cce0e7165..5e01f231bc 100644 --- a/engine/userguide/storagedriver/device-mapper-driver.md +++ b/engine/userguide/storagedriver/device-mapper-driver.md @@ -373,8 +373,8 @@ If you run into repeated problems with thin pool, you can use the `dm.min_free_space` option to tune the Engine behavior. This value ensures that operations fail with a warning when the free space is at or near the minimum. For information, see the storage driver options in the Engine daemon reference. +href="/engine/reference/commandline/dockerd/#storage-driver-options" +target="_blank">the storage driver options in the Engine daemon reference. ### Examine devicemapper structures on the host diff --git a/machine/install-machine.md b/machine/install-machine.md index 29bb51bf0d..3235d64435 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -17,7 +17,7 @@ docker/machine release page on GitHub. ## Installing Machine Directly -1. Install the Docker binary. 2. Download the Docker Machine binary and extract it to your PATH. diff --git a/opensource/ways/test.md b/opensource/ways/test.md index d6a24b4eb5..80ec316d62 100644 --- a/opensource/ways/test.md +++ b/opensource/ways/test.md @@ -29,7 +29,7 @@ Testing documentation is relatively easy: ## Step 1. Find a page in Docker's documentation that contains a procedure or example you want to test. You should choose something that _should work_ on your machine. For example, -creating +creating a base image is something anyone with Docker can do. While changing volume directories in Kitematic requires a Mac and Docker's Kitematic diff --git a/swarm/overview.md b/swarm/overview.md index f52523ff8f..0d2930588d 100644 --- a/swarm/overview.md +++ b/swarm/overview.md @@ -75,4 +75,4 @@ like-minded individuals, we have a number of open channels for communication. * To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/swarm/pulls). -For more information and resources, please visit the [Getting Help project page](/project/get-help/). +For more information and resources, please visit the [Getting Help project page](/opensource/get-help/).