diff --git a/_config.yml b/_config.yml index fca765c6cf..507918769c 100644 --- a/_config.yml +++ b/_config.yml @@ -66,7 +66,7 @@ defaults: layout: docs sitemap: false toc_min: 2 - toc_max: 3 + toc_max: 4 - scope: path: engine/reference/commandline diff --git a/_config_production.yml b/_config_production.yml index e9694966a8..93078da0de 100644 --- a/_config_production.yml +++ b/_config_production.yml @@ -47,7 +47,7 @@ defaults: values: layout: docs toc_min: 2 - toc_max: 3 + toc_max: 4 # Set the correct edit-URL for upstream resources. We usually don't create a direct # edit link for these, and instead point to the directory that contains the file. diff --git a/components.md b/components.md index 355684ac34..048117c130 100644 --- a/components.md +++ b/components.md @@ -44,11 +44,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
@@ -58,11 +58,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
@@ -72,11 +72,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
@@ -92,11 +92,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
@@ -106,11 +106,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
@@ -120,11 +120,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
diff --git a/desktop/dashboard.md b/desktop/dashboard.md index 50f456fdf6..55f9e15b38 100644 --- a/desktop/dashboard.md +++ b/desktop/dashboard.md @@ -5,8 +5,6 @@ title: Docker Dashboard redirect_from: - /docker-for-mac/dashboard/ - /docker-for-windows/dashboard/ -toc_min: 2 -toc_max: 3 --- The Docker Dashboard provides a simple interface that enables you to manage your containers, applications, and images directly from your machine without having to use the CLI to perform core actions. diff --git a/desktop/dev-environments.md b/desktop/dev-environments.md index c573c811e9..c03217ef62 100644 --- a/desktop/dev-environments.md +++ b/desktop/dev-environments.md @@ -2,8 +2,6 @@ description: Dev Environments keywords: Dev Environments, share, collaborate, local title: Development Environments Preview -toc_min: 1 -toc_max: 2 --- Dev Environments enable you to collaborate easily by allowing you to share work-in-progress code with your team members. When using Dev Environments, you can easily set up repeatable development environments, keeping the environment details versioned along with your code. You can also share your work-in-progress code with your team members in just one click and without having to deal with any merge conflicts while moving between Git branches to get your code on to their machine. diff --git a/desktop/faqs.md b/desktop/faqs.md index 8603ee0e58..c79d1cd231 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -6,7 +6,6 @@ redirect_from: - /docker-for-mac/faqs/ - /docker-for-windows/faqs/ title: Frequently asked questions -toc_max: 2 --- ## General diff --git a/desktop/index.md b/desktop/index.md index ede5a95826..0f5383e3b9 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -2,8 +2,6 @@ description: Docker Desktop overview keywords: Desktop, Docker, GUI, run, docker, local, machine title: Docker Desktop overview -toc_min: 1 -toc_max: 2 redirect_from: - /desktop/opensource/ - /docker-for-mac/opensource/ diff --git a/desktop/linux/index.md b/desktop/linux/index.md index 0ed0d11b62..4abdaa6707 100644 --- a/desktop/linux/index.md +++ b/desktop/linux/index.md @@ -2,8 +2,6 @@ description: Docker Desktop for Linux (Beta) keywords: docker, Desktop for linux, beta, tech preview title: Docker Desktop for Linux (Beta) -toc_min: 1 -toc_max: 2 --- Welcome to the Docker Desktop for Linux (Beta). The Beta program is aimed at early adopters who would like to try Docker Desktop for Linux and provide feedback. diff --git a/desktop/mac/apple-silicon.md b/desktop/mac/apple-silicon.md index 49643b53bd..3622c956b5 100644 --- a/desktop/mac/apple-silicon.md +++ b/desktop/mac/apple-silicon.md @@ -2,8 +2,6 @@ description: Docker Desktop for Apple silicon keywords: Docker Desktop, M1, Silicon, Apple, title: Docker Desktop for Apple silicon -toc_min: 2 -toc_max: 3 redirect_from: - /docker-for-mac/apple-m1/ - /docker-for-mac/apple-silicon/ diff --git a/desktop/mac/index.md b/desktop/mac/index.md index 74dbe9ea89..0dcbac8d4c 100644 --- a/desktop/mac/index.md +++ b/desktop/mac/index.md @@ -17,8 +17,6 @@ redirect_from: - /docker-for-mac/osxfs/ - /docker-for-mac/osxfs-caching/ title: Docker Desktop for Mac user manual -toc_min: 1 -toc_max: 2 --- Welcome to Docker Desktop! The Docker Desktop for Mac user manual provides information on how to configure and manage your Docker Desktop settings. diff --git a/desktop/mac/install.md b/desktop/mac/install.md index a1b5190bef..e5819d9406 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -94,12 +94,10 @@ Your Mac must meet the following requirements to install Docker Desktop successf After downloading `Docker.dmg`, run the following commands in a terminal to install Docker Desktop in the Applications folder: - - -``` -sudo hdiutil attach Docker.dmg -sudo /Volumes/Docker/Docker.app/Contents/MacOS/install -sudo hdiutil detach /Volumes/Docker +```console +$ sudo hdiutil attach Docker.dmg +$ sudo /Volumes/Docker/Docker.app/Contents/MacOS/install +$ sudo hdiutil detach /Volumes/Docker ``` The `install` command accepts the following flags: diff --git a/desktop/mac/troubleshoot.md b/desktop/mac/troubleshoot.md index 3caaf7e211..9ff2c5a61b 100644 --- a/desktop/mac/troubleshoot.md +++ b/desktop/mac/troubleshoot.md @@ -5,7 +5,6 @@ redirect_from: - /docker-for-mac/troubleshoot/ - /mackit/troubleshoot/ title: Logs and troubleshooting -toc_max: 2 --- {% include upgrade-cta.html @@ -70,7 +69,7 @@ the log data. Before reporting an issue, we recommend that you read the informat Before you get started, we recommend that you sign into your Docker Desktop application and your [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} account. 1. Choose ![whale menu](images/whale-x.png){: .inline} > **Troubleshoot**. -2. Sign into Docker Desktop. In addition, ensure you are signed into your [Docker account](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"}. +2. Optional: Sign into Docker Desktop. In addition, ensure you are signed into your [Docker account](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"}. 3. Click **Get support**. This opens the in-app **Support** page and starts collecting the diagnostics. ![Diagnose & Feedback](images/diagnose-support.png){:width="600px"} 4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**. diff --git a/desktop/windows/index.md b/desktop/windows/index.md index 4ed0897583..488d69ce5d 100644 --- a/desktop/windows/index.md +++ b/desktop/windows/index.md @@ -14,8 +14,6 @@ redirect_from: - /winkit/getting-started/ title: Docker Desktop for Windows user manual -toc_min: 1 -toc_max: 2 --- Welcome to Docker Desktop! The Docker Desktop for Windows user manual provides information on how to configure and manage your Docker Desktop settings. diff --git a/desktop/windows/troubleshoot.md b/desktop/windows/troubleshoot.md index d135d750b0..22423f0572 100644 --- a/desktop/windows/troubleshoot.md +++ b/desktop/windows/troubleshoot.md @@ -6,7 +6,6 @@ redirect_from: - /docker-for-win/troubleshoot/ - /docker-for-windows/troubleshoot/ title: Logs and troubleshooting -toc_max: 2 --- {% include upgrade-cta.html @@ -48,7 +47,7 @@ troubleshoot the log data. Before reporting an issue, we recommend that you read 1. Choose ![whale menu](images/whale-x.png){: .inline} > **Troubleshoot** from the menu. -2. Sign into Docker Desktop. In addition, ensure you are signed into your [Docker account](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"}. +2. Optional: Sign into Docker Desktop. In addition, ensure you are signed into your [Docker account](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"}. 3. Click **Get support**. This opens the in-app **Support** page and starts collecting the diagnostics. ![Diagnose & Support](../mac/images/diagnose-support.png){:width="600px"} 4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**. diff --git a/desktop/windows/wsl.md b/desktop/windows/wsl.md index 79515c5382..976ca952f2 100644 --- a/desktop/windows/wsl.md +++ b/desktop/windows/wsl.md @@ -5,8 +5,6 @@ redirect_from: - /docker-for-windows/wsl/ - /docker-for-windows/wsl-tech-preview/ title: Docker Desktop WSL 2 backend -toc_min: 2 -toc_max: 3 --- > **Update to the Docker Desktop terms**