Merge branch 'master' of https://github.com/Microsoft/vscode-docs-pr

Author: Greg Van Liew

docs/remote/faq.md

@@ -59,9 +59,9 @@ The VS Code Server requires outbound HTTPS (port 443) connectivity to `update.co
 
 Most Linux distributions will not require additional dependency installation steps. For SSH, Linux hosts need to have Bash (`/bin/bash`), `tar`, and either `curl` or `wget` installed which could be missing from certain stripped down distributions. However, [Alpine Linux](https://alpinelinux.org) is currently not supported.
 
-### Can the Docker Extension run as a Workspace Extension in a remote setup?
+### Can the Docker extension run as a remote "workspace" extension?
 
-The Docker extension is by default configured as a UI extension. This enables the extension to work better with a Docker machine that runs locally while you are developing inside a container. If you want to run the Docker Extension on the workspace side, so that it communicates with a remotely installed Docker machine, then you can configure the Docker extension to run remotely using the following user setting:
+The Docker extension is configured to run as a local "UI" extension by default. This enables the extension to work with your local Docker installation when you are developing inside a container. However, you may want to use the extension with a Docker Machine installed on a remote host instead. Fortunately, you can configure the Docker extension to run on the host by adding the following to `settings.json`:
 
 ```json
 "remote.extensionKind": {

docs/remote/images/common/remote-dev-status-bar.png

@@ -172,6 +172,16 @@ VS Code's local user settings are also reused when you are connected to an SSH h
 - Local proxy settings are not reused on the remote host, which can prevent extensions from working unless the appropriate proxy information is configured on the remote host (for example global `HTTP_PROXY` or `HTTPS_PROXY` environment variables with the appropriate proxy information).
 - See [here for a list of active issues](https://aka.ms/vscode-remote/ssh/issues) related to SSH.
 
+### Docker Extension limitations
+
+The Docker extension is configured to run as a local "UI" extension by default. This enables the extension to work with your local Docker installation when you are developing inside a container. However, you may want to use the extension with a Docker Machine installed on a remote host instead. Fortunately, you can configure the Docker extension to run on the host by adding the following to `settings.json`:
+
+```json
+"remote.extensionKind": {
+    "peterjausovec.vscode-docker": "workspace"
+}
+```
+
 ### Extension limitations
 
 Many extensions will work on remote SSH hosts modification. However, in some cases, certain features may require changes. If you run into an extension issue, there is [a summary of common problems and solutions](/docs/remote/troubleshooting.md#extensiont-tips) that you can mention to the extension author when reporting the issue.

docs/remote/images/wsl/wsl-statusbar-indicator.png

@@ -131,6 +131,16 @@ NodeJS Error: spawn EACCES (different variants of this error) | https://github.c
 Webpack HMR not working | https://github.com/Microsoft/WSL/issues/2709 |
 Firebase via node unusably slow only on WSL | https://github.com/Microsoft/WSL/issues/2657 |
 
+### Docker Extension limitations
+
+The Docker extension is configured to run as a local "UI" extension that runs on the Windows side by default. This enables the extension to work with your local Docker installation when you are developing inside a container. However, some Docker commands invoked from the Docker extension can fail from a WSL window. If you want the Docker extension to interact with an installed Docker CLI in WSL instead, add the following to `settings.json`:
+
+```json
+"remote.extensionKind": {
+    "peterjausovec.vscode-docker": "workspace"
+}
+```
+
 ### Extension limitations
 
 Many extensions will work in WSL without modification. However, in some cases, certain features may require changes. If you run into an extension issue, [see here for a summary of common problems and solutions](/docs/remote/troubleshooting.md#extensiont-tips) that you can mention to the extension author when reporting the issue.