merge dashboard and user manual

_data/toc.yaml

@@ -1155,10 +1155,18 @@ manuals:
               title: Install on Ubuntu
             - path: /desktop/install/archlinux/
               title: Install on Arch
+    - path: /desktop/get-started/
+      title: Quick Start Guide and sign in
+    - sectiontitle: Explore Docker Desktop
+      section:
+        - path: /desktop/use-desktop/container/
+          title: Explore Containers
+        - path: /desktop/use-desktop/images/
+          title: Explore Images
+        - path: /desktop/use-desktop/volumes/
+          title: Explore Volumes
     - sectiontitle: Mac
       section:
-        - path: /desktop/mac/
-          title: User manual
         - path: /desktop/mac/troubleshoot/
           title: Logs and troubleshooting
         - path: /desktop/mac/apple-silicon/
@@ -1167,20 +1175,14 @@ manuals:
           title: Privileged Helper
     - sectiontitle: Windows
       section:
-        - path: /desktop/windows/
-          title: User manual
         - path: /desktop/windows/troubleshoot/
           title: Logs and troubleshooting
         - path: /desktop/windows/wsl/
           title: Docker Desktop WSL 2 backend
     - sectiontitle: Linux
       section:
-        - path: /desktop/linux/
-          title: User manual
         - path: /desktop/linux/troubleshoot/
-          title: Logs and troubleshooting    
-    - path: /desktop/dashboard/
-      title: Dashboard
+          title: Logs and troubleshooting
     - sectiontitle: Change settings
       section:
         - path: /desktop/settings/mac/

desktop/faqs/general.md

@@ -42,7 +42,7 @@ cannot access features that require an active internet
 connection. Additionally, any functionality that requires you to sign won't work while using Docker Desktop offline or in air-gapped environments.
 This includes:
 
-- The in-app [Quick Start Guide](../install/mac-install.md#quick-start-guide)
+- The in-app [Quick Start Guide](../get-started.md#quick-start-guide)
 - Pulling or pushing an image to Docker Hub
 - [Image Access Management](../../docker-hub/image-access-management.md)
 - [Vulnerability scanning](../../docker-hub/vulnerability-scanning.md)

desktop/faqs/macfaqs.md

@@ -118,3 +118,167 @@ To reduce the maximum size of the disk image file:
 
 When you reduce the maximum size, the current disk image file is deleted, and therefore, all containers and images will be lost.
 
+### How do I add TLS certificates?
+
+You can add trusted Certificate Authorities (CAs) (used to verify registry
+server certificates) and client certificates (used to authenticate to
+registries) to your Docker daemon.
+
+#### Add custom CA certificates (server side)
+
+All trusted CAs (root or intermediate) are supported. Docker Desktop creates a
+certificate bundle of all user-trusted CAs based on the Mac Keychain, and
+appends it to Moby trusted certificates. So if an enterprise SSL certificate is
+trusted by the user on the host, it is trusted by Docker Desktop.
+
+To manually add a custom, self-signed certificate, start by adding the
+certificate to the macOS keychain, which is picked up by Docker Desktop. Here is
+an example:
+
+```console
+$ sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain ca.crt
+```
+
+Or, if you prefer to add the certificate to your own local keychain only (rather
+than for all users), run this command instead:
+
+```console
+$ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain ca.crt
+```
+
+See also, [Directory structures for
+certificates](#directory-structures-for-certificates).
+
+> **Note**: You need to restart Docker Desktop after making any changes to the
+> keychain or to the `~/.docker/certs.d` directory in order for the changes to
+> take effect.
+For a complete explanation of how to do this, see the blog post [Adding
+Self-signed Registry Certs to Docker & Docker Desktop for
+Mac](https://blog.container-solutions.com/adding-self-signed-registry-certs-docker-mac){:target="_blank" rel="noopener" class="_"}.
+
+#### Add client certificates
+
+You can put your client certificates in
+`~/.docker/certs.d/<MyRegistry>:<Port>/client.cert` and
+`~/.docker/certs.d/<MyRegistry>:<Port>/client.key`.
+
+When the Docker Desktop application starts, it copies the `~/.docker/certs.d`
+folder on your Mac to the `/etc/docker/certs.d` directory on Moby (the Docker
+Desktop `xhyve` virtual machine).
+
+> * You need to restart Docker Desktop after making any changes to the keychain
+>   or to the `~/.docker/certs.d` directory in order for the changes to take
+>   effect.
+>
+> * The registry cannot be listed as an _insecure registry_. Docker Desktop ignores certificates listed
+>   under insecure registries, and does not send client certificates. Commands
+>   like `docker run` that attempt to pull from the registry produce error
+>   messages on the command line, as well as on the registry.
+#### Directory structures for certificates
+
+If you have this directory structure, you do not need to manually add the CA
+certificate to your Mac OS system login:
+
+```
+/Users/<user>/.docker/certs.d/
+└── <MyRegistry>:<Port>
+   ├── ca.crt
+   ├── client.cert
+   └── client.key
+```
+
+The following further illustrates and explains a configuration with custom
+certificates:
+
+```
+/etc/docker/certs.d/        <-- Certificate directory
+└── localhost:5000          <-- Hostname:port
+   ├── client.cert          <-- Client certificate
+   ├── client.key           <-- Client key
+   └── ca.crt               <-- Certificate authority that signed
+                                the registry certificate
+```
+
+You can also have this directory structure, as long as the CA certificate is
+also in your keychain.
+
+```
+/Users/<user>/.docker/certs.d/
+└── <MyRegistry>:<Port>
+    ├── client.cert
+    └── client.key
+```
+
+To learn more about how to install a CA root certificate for the registry and
+how to set the client TLS certificate for verification, see
+[Verify repository client with certificates](../../engine/security/certificates.md)
+in the Docker Engine topics.
+
+### How do I install shell completion?
+
+Docker Desktop comes with scripts to enable completion for the `docker` and `docker-compose` commands. The completion scripts may be
+found inside `Docker.app`, in the `Contents/Resources/etc/` directory and can be
+installed both in Bash and Zsh.
+
+#### Bash
+
+Bash has [built-in support for
+completion](https://www.debian-administration.org/article/316/An_introduction_to_bash_completion_part_1){:target="_blank"
+class="_"} To activate completion for Docker commands, these files need to be
+copied or symlinked to your `bash_completion.d/` directory. For example, if you
+installed bash via [Homebrew](https://brew.sh):
+
+```bash
+etc=/Applications/Docker.app/Contents/Resources/etc
+ln -s $etc/docker.bash-completion $(brew --prefix)/etc/bash_completion.d/docker
+ln -s $etc/docker-compose.bash-completion $(brew --prefix)/etc/bash_completion.d/docker-compose
+```
+
+Add the following to your `~/.bash_profile`:
+
+```bash
+[ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion
+```
+
+OR
+
+```bash
+if [ -f $(brew --prefix)/etc/bash_completion ]; then
+. $(brew --prefix)/etc/bash_completion
+fi
+```
+
+#### Zsh
+
+In Zsh, the [completion
+system](http://zsh.sourceforge.net/Doc/Release/Completion-System.html){:target="_blank" rel="nooopener" class="_"}
+takes care of things. To activate completion for Docker commands,
+these files need to be copied or symlinked to your Zsh `site-functions/`
+directory. For example, if you installed Zsh via [Homebrew](https://brew.sh){:target="_blank" rel="nooopener" class="_"}:
+
+```bash
+etc=/Applications/Docker.app/Contents/Resources/etc
+ln -s $etc/docker.zsh-completion /usr/local/share/zsh/site-functions/_docker
+ln -s $etc/docker-compose.zsh-completion /usr/local/share/zsh/site-functions/_docker-compose
+```
+
+#### Fish-Shell
+
+Fish-shell also supports tab completion [completion
+system](https://fishshell.com/docs/current/#tab-completion){:target="_blank"
+class="_"}. To activate completion for Docker commands,
+these files need to be copied or symlinked to your Fish-shell `completions/`
+directory.
+
+Create the `completions` directory:
+
+```console
+$ mkdir -p ~/.config/fish/completions
+```
+
+Now add fish completions from docker.
+
+```console
+$ ln -shi /Applications/Docker.app/Contents/Resources/etc/docker.fish-completion ~/.config/fish/completions/docker.fish
+$ ln -shi /Applications/Docker.app/Contents/Resources/etc/docker-compose.fish-completion ~/.config/fish/completions/docker-compose.fish
+```

desktop/faqs/windowsfaqs.md

@@ -61,3 +61,77 @@ The Windows native symlinks are visible within the containers as symlinks, where
 
 Docker Desktop mounts the Windows host filesystem under `/run/desktop` inside the container running Kubernetes.
 See the [Stack Overflow post](https://stackoverflow.com/questions/67746843/clear-persistent-volume-from-a-kubernetes-cluster-running-on-docker-desktop/69273405#69273){:target="_blank" rel="noopener" class="_"} for an example of how to configure a Kubernetes Persistent Volume to represent directories on the host.
+
+### How do I add custom CA certificates?
+
+You can add trusted **Certificate Authorities (CAs)** to your Docker daemon to verify registry server certificates, and **client certificates**, to authenticate to registries.
+
+Docker Desktop supports all trusted Certificate Authorities (CAs) (root or
+intermediate). Docker recognizes certs stored under Trust Root
+Certification Authorities or Intermediate Certification Authorities.
+
+Docker Desktop creates a certificate bundle of all user-trusted CAs based on
+the Windows certificate store, and appends it to Moby trusted certificates. Therefore, if an enterprise SSL certificate is trusted by the user on the host, it is trusted by Docker Desktop.
+
+To learn more about how to install a CA root certificate for the registry, see
+[Verify repository client with certificates](../../engine/security/certificates.md)
+in the Docker Engine topics.
+
+### How do I add client certificates?
+
+You can add your client certificates
+in `~/.docker/certs.d/<MyRegistry><Port>/client.cert` and
+`~/.docker/certs.d/<MyRegistry><Port>/client.key`. You do not need to push your certificates with `git` commands.
+
+When the Docker Desktop application starts, it copies the
+`~/.docker/certs.d` folder on your Windows system to the `/etc/docker/certs.d`
+directory on Moby (the Docker Desktop virtual machine running on Hyper-V).
+
+You need to restart Docker Desktop after making any changes to the keychain
+or to the `~/.docker/certs.d` directory in order for the changes to take effect.
+
+The registry cannot be listed as an _insecure registry_ (see
+[Docker Daemon](../settings/windows.md#docker-engine)). Docker Desktop ignores
+certificates listed under insecure registries, and does not send client
+certificates. Commands like `docker run` that attempt to pull from the registry
+produce error messages on the command line, as well as on the registry.
+
+To learn more about how to set the client TLS certificate for verification, see
+[Verify repository client with certificates](../../engine/security/certificates.md)
+in the Docker Engine topics.
+
+## How do I switch between Windows and Linux containers
+
+From the Docker Desktop menu, you can toggle which daemon (Linux or Windows)
+the Docker CLI talks to. Select **Switch to Windows containers** to use Windows
+containers, or select **Switch to Linux containers** to use Linux containers
+(the default).
+
+For more information on Windows containers, refer to the following documentation:
+
+- Microsoft documentation on [Windows containers](https://docs.microsoft.com/en-us/virtualization/windowscontainers/about/index).
+
+- [Build and Run Your First Windows Server Container (Blog Post)](https://blog.docker.com/2016/09/build-your-first-docker-windows-server-container/)
+  gives a quick tour of how to build and run native Docker Windows containers on Windows 10 and Windows Server 2016 evaluation releases.
+
+- [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md)
+  shows you how to use the [MusicStore](https://github.com/aspnet/MusicStore/blob/dev/README.md)
+  application with Windows containers. The MusicStore is a standard .NET application and,
+  [forked here to use containers](https://github.com/friism/MusicStore), is a good example of a multi-container application.
+
+- To understand how to connect to Windows containers from the local host, see
+  [I want to connect to a container from Windows](../networking.md#i-want-to-connect-to-a-container-from-the-host)
+
+> Settings dialog changes with Windows containers
+>
+> When you switch to Windows containers, the Settings dialog only shows those tabs that are active and apply to your Windows containers:
+>
+  * [General](../settings/windows.md#general)
+  * [Proxies](../settings/windows.md#proxies)
+  * [Daemon](../settings/windows.md#docker-engine)
+
+If you set proxies or daemon configuration in Windows containers mode, these
+apply only on Windows containers. If you switch back to Linux containers,
+proxies and daemon configurations return to what you had set for Linux
+containers. Your Windows container settings are retained and become available
+again when you switch back.