Merge pull request #14554 from docker/master

Updates to master

_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

_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.

components.md

@@ -44,11 +44,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingOne">
-      <h4 class="panel-title">
+      <h5 class="panel-title">
         <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
           Collapsible Group Item #1
         </a>
-      </h4>
+      </h5>
     </div>
     <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
       <div class="panel-body">
@@ -58,11 +58,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
   </div>
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingTwo">
-      <h4 class="panel-title">
+      <h5 class="panel-title">
         <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
           Collapsible Group Item #2
         </a>
-      </h4>
+      </h5>
     </div>
     <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
       <div class="panel-body">
@@ -72,11 +72,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
   </div>
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingThree">
-      <h4 class="panel-title">
+      <h5 class="panel-title">
         <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
           Collapsible Group Item #3
         </a>
-      </h4>
+      </h5>
     </div>
     <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
       <div class="panel-body">
@@ -92,11 +92,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingOne">
-      <h4 class="panel-title">
+      <h5 class="panel-title">
         <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
           Collapsible Group Item #1
         </a>
-      </h4>
+      </h5>
     </div>
     <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
       <div class="panel-body">
@@ -106,11 +106,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
   </div>
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingTwo">
-      <h4 class="panel-title">
+      <h5 class="panel-title">
         <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
           Collapsible Group Item #2
         </a>
-      </h4>
+      </h5>
     </div>
     <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
       <div class="panel-body">
@@ -120,11 +120,11 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
   </div>
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingThree">
-      <h4 class="panel-title">
+      <h5 class="panel-title">
         <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
           Collapsible Group Item #3
         </a>
-      </h4>
+      </h5>
     </div>
     <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
       <div class="panel-body">

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.

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.

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

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/

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.

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/

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.

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:
 
-
+```console
-
+$ sudo hdiutil attach Docker.dmg
-```
+$ sudo /Volumes/Docker/Docker.app/Contents/MacOS/install
-sudo hdiutil attach Docker.dmg
+$ sudo hdiutil detach /Volumes/Docker
-sudo /Volumes/Docker/Docker.app/Contents/MacOS/install
-sudo hdiutil detach /Volumes/Docker
 ```
 
 The `install` command accepts the following flags:

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**.

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.

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**.

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**