diff --git a/_includes/kubernetes-mac-win.md b/_includes/kubernetes-mac-win.md index 3469dcdc8b..4428cfd5be 100644 --- a/_includes/kubernetes-mac-win.md +++ b/_includes/kubernetes-mac-win.md @@ -114,8 +114,10 @@ when deploying to override the default orchestrator for that deployment. docker stack deploy --orchestrator swarm --compose-file /path/to/docker-compose.yml mystack ``` -> **Note**: Deploying the same app in Kubernetes and swarm mode may lead to -> conflicts with ports and service names. +> **Note** +> +> Deploying the same app in Kubernetes and swarm mode may lead to conflicts with +> ports and service names. ## Use the kubectl command diff --git a/docker-for-mac/osxfs.md b/docker-for-mac/osxfs.md index a7749bca7a..bc313b36d9 100644 --- a/docker-for-mac/osxfs.md +++ b/docker-for-mac/osxfs.md @@ -61,8 +61,8 @@ bin dev home lib32 libx32 mnt proc run srv tmp var By default, you can share files in `/Users/`, `/Volumes/`, `/private/`, and `/tmp` directly. To add or remove directory trees that are exported to Docker, -use the **File sharing** tab in Docker preferences ![whale -menu](images/whale-x.png){: .inline} -> **Preferences** -> +use the **File sharing** tab in Docker preferences +![whale menu](images/whale-x.png){: .inline} -> **Preferences** -> **File sharing**. (See [Preferences](index.md#file-sharing).) All other paths diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index df76dc89ff..a17f665a79 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -64,8 +64,7 @@ Once the diagnostics are available, you can upload them and obtain a team. For more information on our policy regarding personal data, see [how is personal data handled in Docker Desktop](faqs.md#how-is-personal-data-handled-in-docker-desktop). -![Diagnostics & Feedback with -ID](images/diagnose-feedback-id.png){:width="600px"} +![Diagnostics & Feedback with ID](images/diagnose-feedback-id.png){:width="600px"} If you click **Report an issue**, this opens Docker Desktop [for Mac](https://github.com/docker/for-mac/issues/) issues on GitHub in your web browser in a "New issue" template. Add the details before submitting the issue. Do not forget to copy/paste your diagnostic ID. @@ -265,8 +264,8 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install the Activity Monitor, and for some processes to consume a large amount of CPU resources. Reboot and restart Docker to resolve these issues. -* Docker does not auto-start on login even when it is enabled in ![whale - menu](images/whale-x.png){: .inline} > **Preferences**. This is related to a +* Docker does not auto-start on login even when it is enabled in + ![whale menu](images/whale-x.png){: .inline} > **Preferences**. This is related to a set of issues with Docker helper, registration, and versioning. * Docker Desktop uses the `HyperKit` hypervisor diff --git a/docker-for-windows/docker-toolbox.md b/docker-for-windows/docker-toolbox.md index 589d2a28b9..f5e0d41701 100644 --- a/docker-for-windows/docker-toolbox.md +++ b/docker-for-windows/docker-toolbox.md @@ -9,12 +9,15 @@ you have them, to Docker Desktop for Windows. ## How to migrate Docker Toolbox disk images to Docker Desktop -> **Warning**: Migrating disk images from Docker Toolbox _clobbers_ Docker -> images if they exist. The migration process replaces the entire VM with your -> previous Docker Toolbox data. +> **Warning** +> +> Migrating disk images from Docker Toolbox _clobbers_ Docker images if they +> exist. The migration process replaces the entire VM with your previous Docker +> Toolbox data. +{: .warning } 1. Install [qemu](https://www.qemu.org/){: target="_blank" class="_"} (a machine emulator): [https://cloudbase.it/downloads/qemu-img-win-x64-2_3_0.zip](https://cloudbase.it/downloads/qemu-img-win-x64-2_3_0.zip). -2. Install [Docker Desktop for Windows](install/){: target="_blank" class="_"}. +2. Install [Docker Desktop for Windows](install.md){: target="_blank" class="_"}. 3. Stop Docker Desktop, if running. 4. Move your current Docker VM disk to a safe location: @@ -34,4 +37,4 @@ you have them, to Docker Desktop for Windows. Whether or not you migrate your Docker Toolbox images, you may decide to uninstall it. For details on how to perform a clean uninstall of Toolbox, -see [How to uninstall Toolbox](/toolbox/toolbox_install_windows/#how-to-uninstall-toolbox){: target="_blank" class="_"}. +see [How to uninstall Toolbox](../toolbox/toolbox_install_windows.md#how-to-uninstall-toolbox){: target="_blank" class="_"}.