diff --git a/_scss/_utilities.scss b/_scss/_utilities.scss index 35f12bed4a..726f652b0b 100755 --- a/_scss/_utilities.scss +++ b/_scss/_utilities.scss @@ -58,6 +58,9 @@ i.fa.fa-outdent { padding: 0px 15px 10px 15px; } +img.inline { + display: inline; +} /* * Search ********************************************************************* @@ -259,4 +262,3 @@ div#autocompleteResults span { input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus { display: none!important; } - diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 9eee6bd7f5..78829fb0ce 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -100,8 +100,8 @@ docker-machine version 0.10.0, build 76ed2a6 ## Preferences -Choose ![whale-x](/docker-for-mac/images/whale-x.png) --> **Preferences** from -the menu bar. +Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -> +**Preferences** from the menu bar. ![Docker context menu](images/menu-prefs-selected.png) @@ -122,10 +122,10 @@ see [Docker Cloud](#docker-cloud). open your session. * Docker for Mac is set to **automatically check for updates** and notify - you when an update is available. If an update is found, click **OK** to - accept and install it (or cancel to keep the current version). If you - disable the check for updates, you can still find out about updates manually - by choosing ![whale-x](/docker-for-mac/images/whale-x.png) -> **Check for Updates** + you when an update is available. If an update is found, click **OK** to accept +and install it (or cancel to keep the current version). If you disable the check +for updates, you can still find out about updates manually by choosing ![whale +menu](/docker-for-mac/images/whale-x.png){: .inline} -> **Check for Updates** * Check **Include VM in Time Machine backups** to back up the Docker for Mac virtual machine. (By default, this is unchecked.) @@ -294,8 +294,9 @@ choose to discard or not apply changes when asked. ![Docker Daemon](/docker-for-mac/images/settings-daemon-beta.png) ## Uninstall or reset -Choose ![whale-x](/docker-for-mac/images/whale-x.png) --> **Preferences** from -the menu bar, then click **Uninstall / Reset** on the Preferences dialog. +Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -> +**Preferences** from the menu bar, then click **Uninstall / Reset** on the +Preferences dialog. ![Uninstall or reset Docker](images/settings-uninstall.png) diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md index e68330d44f..60221dbe8b 100644 --- a/docker-for-mac/install.md +++ b/docker-for-mac/install.md @@ -145,14 +145,14 @@ explanation and list of prerequisites. ![Whale in menu bar](/docker-for-mac/images/whale-in-menu-bar.png) - If you just installed the app, you also get a success message with suggested - next steps and a link to this documentation. Click the whale (![whale](/docker-for-mac/images/whale-x.png)) - in the status bar to dismiss this popup. + If you just installed the app, you also get a success message with suggested + next steps and a link to this documentation. Click the whale (![whale + menu](/docker-for-mac/images/whale-x.png){: .inline}) in the status bar to + dismiss this popup. ![Startup information](/docker-for-mac/images/mac-install-success-docker-cloud.png) -3. Click the whale (![whale-x](images/whale-x.png)) to get Preferences and - other options. +3. Click the whale (![whale menu](/docker-for-mac/images/whale-x.png){: .inline}) to get Preferences and other options. ![Docker context menu](images/menu.png) diff --git a/docker-for-mac/opensource.md b/docker-for-mac/opensource.md index dd5e6358bf..17b1115fc2 100644 --- a/docker-for-mac/opensource.md +++ b/docker-for-mac/opensource.md @@ -5,10 +5,10 @@ title: Open source components and licensing notoc: true --- -Docker Desktop Editions are built using open source software. For -details on the licensing, choose --> -**About Docker** from within the application, then click -**Acknowledgements**. +Docker Desktop Editions are built using open source software. +For details on the licensing, choose +![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> +**About Docker** from within the application, then click **Acknowledgements**. Docker Desktop Editions distribute some components that are licensed under the GNU General Public License. You can download the source for these components diff --git a/docker-for-mac/osxfs.md b/docker-for-mac/osxfs.md index e641163dba..a1ebde3671 100644 --- a/docker-for-mac/osxfs.md +++ b/docker-for-mac/osxfs.md @@ -55,10 +55,10 @@ Desktop boot etc lib lib64 media opt root sbin sys usr 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 ![Docker Preferences](images/whale-x.png) -> **Preferences** -> +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](/docker-for-mac/images/whale-x.png){: .inline} -> **Preferences** -> **File sharing**. (See [Preferences](index.md#preferences).) All other paths diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index 64b5707f4f..0f36e49827 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -22,8 +22,8 @@ GitHub](https://github.com/docker/for-mac/issues) already filed by other users, or on the [Docker for Mac forum](https://forums.docker.com/c/docker-for-mac), we can help you troubleshoot the log data. -Choose --> **Diagnose & Feedback** from the -menu bar. +Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> +**Diagnose & Feedback** from the menu bar. ![Diagnose problems](images/settings-diagnose.png) @@ -156,8 +156,9 @@ start (e.g., with [Docker Compose](/compose/gettingstarted.md)), you might need to enable [file sharing](index.md#file-sharing). Volume mounting requires shared drives for projects that live outside of the -`/Users` directory. Go to --> **Preferences** --> -**File sharing** and share the drive that contains the Dockerfile and volume. +`/Users` directory. Go to ![whale menu](/docker-for-mac/images/whale-x.png){: +.inline} --> **Preferences** --> **File sharing** and share the drive that +contains the Dockerfile and volume. ### Recreate or update your containers after Beta 18 upgrade @@ -278,7 +279,10 @@ know before you install](install.md#what-to-know-before-you-install). * If Docker for Mac fails to install or start properly: - * Make sure you quit Docker for Mac before installing a new version of the application ( --> **Quit Docker**). Otherwise, you will get an "application in use" error when you try to copy the new app from the `.dmg` to `/Applications`. + * Make sure you quit Docker for Mac before installing a new version + of the application ( ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Quit Docker**). Otherwise, you will get an + "application in use" error when you try to copy the new app + from the `.dmg` to `/Applications`. * Restart your Mac to stop / discard any vestige of the daemon running from the previously installed version. @@ -337,11 +341,20 @@ Docker for Mac does not yet support IPv6. See "IPv6 workaround to auto-filter DN

-* Docker does not auto-start on login even when it is enabled in --> **Preferences**. This is related to a set of issues with Docker helper, registration, and versioning. +* Docker does not auto-start on login even when it is enabled in +![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Preferences**. This is related to a set of issues with Docker +helper, registration, and versioning.

-* Docker for Mac uses the `HyperKit` hypervisor (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If you are developing with tools that have conflicts with `HyperKit`, such as [Intel Hardware Accelerated Execution Manager (HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/), the current workaround is not to run them at the same time. You can pause `HyperKit` by quitting Docker for Mac temporarily while you work with HAXM. This will allow you to continue work with the other tools and prevent `HyperKit` from interfering. +* Docker for Mac uses the `HyperKit` hypervisor (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If you +are developing with tools that have conflicts with `HyperKit`, such as [Intel +Hardware Accelerated Execution Manager +(HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/), +the current workaround is not to run them at the same time. You can pause +`HyperKit` by quitting Docker for Mac temporarily while you work with HAXM. This +will allow you to continue work with the other tools and prevent `HyperKit` from +interfering.

diff --git a/docker-for-windows/opensource.md b/docker-for-windows/opensource.md index 5889f11271..333d4f3967 100644 --- a/docker-for-windows/opensource.md +++ b/docker-for-windows/opensource.md @@ -5,8 +5,8 @@ title: Open source components and licensing notoc: true --- -Docker Desktop Editions are built using open source software. For -details on the licensing, choose +Docker Desktop Editions are built using open source software. For details on the +licensing, choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **About** from within the application, then click **Acknowledgements**. Docker Desktop Editions distribute some components that are licensed under the diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 946d8b52db..c0681e58c5 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -120,9 +120,11 @@ application file is not found, a volume mount is denied, or a service cannot start (e.g., with [Docker Compose](/compose/gettingstarted.md)), you might need to enable [shared drives](index.md#shared-drives). -Volume mounting requires shared drives for Linux containers (not for Windows -containers). Go to --> **Settings** --> **Shared -Drives** and share the drive that contains the Dockerfile and volume. +Volume mounting requires shared drives for Linux containers +(not for Windows containers). Go to +![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> +**Settings** --> **Shared Drives** and share the drive that +contains the Dockerfile and volume. ### Verify domain user has permissions for shared drives (volumes)