Update toc (#9819)

README.md

@@ -1,11 +1,9 @@
 # Docs @ Docker
-
 Welcome to the repo for our documentation. This is the source for	
 [https://docs.docker.com/](https://docs.docker.com/).	
 
 Feel free to send us pull requests and file issues. Our docs are completely	
 open source and we deeply appreciate contributions from our community!
-
 ## Table of Contents
 
 - [Providing feedback](#providing-feedback)

_data/toc.yaml

@@ -86,12 +86,6 @@ guides:
         title: Binaries
       - path: /install/linux/linux-postinstall/
         title: Optional Linux post-installation steps
-    - title: MacOS
-      path: /docker-for-mac/install/
-      nosync: true
-    - title: Microsoft Windows
-      path: /docker-for-windows/install/
-      nosync: true
   - sectiontitle: Docker Enterprise
     section:
     - title: About Docker Enterprise
@@ -110,9 +104,6 @@ guides:
         title: Ubuntu
     - path: /install/windows/docker-ee/
       title: Microsoft Windows Server
-    - title: Release notes
-      path: /engine/release-notes/
-      nosync: true
   - sectiontitle: Compatibility between Docker versions
     section:
       - path: /engine/ce-ee-node-activate/
@@ -133,13 +124,13 @@ guides:
     section:
     - title: "Part 1: Orientation and setup"
       path: /get-started/
-    - title: "Part 2: Containerizing an Application"
+    - title: "Part 2: Containerizing an application"
       path: /get-started/part2/
     - title: "Part 3: Deploying to Kubernetes"
       path: /get-started/part3/
     - title: "Part 4: Deploying to Swarm"
       path: /get-started/part4/
-    - title: "Part 5: Sharing Images on Docker Hub"
+    - title: "Part 5: Sharing images on Docker Hub"
       path: /get-started/part5/
   - path: /get-started/resources/
     title: "Educational resources"
@@ -161,20 +152,8 @@ guides:
             title: Docker build enhancements for 18.09
           - path: /develop/develop-images/multistage-build/
             title: Use multi-stage builds
-          - path: /engine/reference/builder/
-            title: Dockerfile reference
-            nosync: true
           - path: /develop/develop-images/image_management/
             title: Manage images
-        - path: /samples/
-          title: Docker app examples
-          nosync: true
-    - sectiontitle: Develop using the Docker Engine SDKs and API
-      section:
-        - path: /develop/sdk/
-          title: Overview
-        - path: /develop/sdk/examples/
-          title: SDK and API examples
 - sectiontitle: Configure networking
   section:
     - path: /network/
@@ -215,7 +194,6 @@ guides:
         title: (Legacy) Container links
       - path: /network/overlay-standalone.swarm/
         title: Overlay networks for Swarm Classic
-
 - sectiontitle: Manage application data
   section:
     - path: /storage/
@@ -262,12 +240,6 @@ guides:
       title: Configure and run Docker
     - path: /config/daemon/systemd/
       title: Control Docker with systemd
-    - path: /config/labels-custom-metadata/
-      title: Apply custom metadata to daemons
-      nosync: true
-    - path: /config/containers/logging/configure/
-      title: Configuring default drivers
-      nosync: true
   - sectiontitle: Work with external tools
     section:
     - path: /config/thirdparty/
@@ -286,12 +258,6 @@ guides:
       title: Container runtime metrics
     - path: /config/containers/resource_constraints/
       title: Runtime options with Memory, CPUs, and GPUs
-    - path: /config/labels-custom-metadata/
-      title: Apply custom metadata to containers
-      nosync: true
-    - path: /config/pruning/
-      title: Prune unused containers
-      nosync: true
     - sectiontitle: Logging
       section:
       - path: /config/containers/logging/
@@ -328,9 +294,6 @@ guides:
           title: Journald logging driver
         - path: /config/containers/logging/splunk/
           title: Splunk logging driver
-    - path: /registry/recipes/mirror/
-      title: Run a local registry mirror
-      nosync: true
     - sectiontitle: Work with external tools
       section:
       - path: /config/thirdparty/dsc/
@@ -341,8 +304,6 @@ guides:
         title: Chef
       - path: /config/thirdparty/puppet/
         title: Puppet
-      - path: /config/thirdparty/ambassador_pattern_linking/
-        title: (Obsolete) Link via an ambassador container
     - sectiontitle: Security
       section:
       - path: /engine/security/security/
@@ -427,8 +388,6 @@ guides:
         title: Manage sensitive data with Docker secrets
       - path: /engine/swarm/swarm_manager_locking/
         title: Lock your swarm
-      - path: /engine/swarm/networking/
-        title: Manage swarm service networks
       - path: /engine/swarm/admin_guide/
         title: Swarm administration guide
       - path: /engine/swarm/raft/
@@ -483,29 +442,34 @@ guides:
     title: FedRAMP
   - path: /compliance/fisma/
     title: FISMA
-
 - sectiontitle: Open source at Docker
   section:
   - path: /opensource/
     title: Contribute to documentation
   - path: /opensource/ways/
     title: Other ways to contribute
-
 - sectiontitle: Documentation archive
   section:
   - path: /docsarchive/
     title: View the docs archives
-  - path: /hackathon/
-    title: Docs hackathon results
 
 reference:
 - sectiontitle: File formats
   section:
   - title: Dockerfile reference
     path: /engine/reference/builder/
-  - title: Compose file reference
+  - sectiontitle: Compose file reference
-    path: /compose/compose-file/
+    section:
-    nosync: true
+    - path: /compose/compose-file/
+      title: Version 3
+    - path: /compose/compose-file/compose-file-v2/
+      title: Version 2
+    - path: /compose/compose-file/compose-file-v1/
+      title: Version 1
+    - path: /compose/compose-file/compose-versioning/
+      title: About versions and upgrading
+    - path: /compose/faq/
+      title: Frequently asked questions
 
 - sectiontitle: Command-Line Interfaces (CLIs)
   section:
@@ -629,7 +593,6 @@ reference:
         title: docker checkpoint ls
       - path: /engine/reference/commandline/checkpoint_rm/
         title: docker checkpoint rm
-
     - sectiontitle: docker cluster *
       section:
         - path: /engine/reference/commandline/cluster/
@@ -1070,14 +1033,64 @@ reference:
         title: docker volume rm
     - path: /engine/reference/commandline/wait/
       title: docker wait
+  - sectiontitle: Docker Compose CLI reference
+    section:
+    - path: /compose/reference/overview/
+      title: Overview of docker-compose CLI
+    - path: /compose/reference/envvars/
+      title: CLI environment variables
+    - path: /compose/completion/
+      title: Command-line completion
+    - path: /compose/reference/build/
+      title: build
+    - path: /compose/reference/bundle/
+      title: bundle
+    - path: /compose/reference/config/
+      title: config
+    - path: /compose/reference/create/
+      title: create
+    - path: /compose/reference/down/
+      title: down
+    - path: /compose/reference/events/
+      title: events
+    - path: /compose/reference/exec/
+      title: exec
+    - path: /compose/reference/help/
+      title: help
+    - path: /compose/reference/kill/
+      title: kill
+    - path: /compose/reference/logs/
+      title: logs
+    - path: /compose/reference/pause/
+      title: pause
+    - path: /compose/reference/port/
+      title: port
+    - path: /compose/reference/ps/
+      title: ps
+    - path: /compose/reference/pull/
+      title: pull
+    - path: /compose/reference/push/
+      title: push
+    - path: /compose/reference/restart/
+      title: restart
+    - path: /compose/reference/rm/
+      title: rm
+    - path: /compose/reference/run/
+      title: run
+    - path: /compose/reference/scale/
+      title: scale
+    - path: /compose/reference/start/
+      title: start
+    - path: /compose/reference/stop/
+      title: stop
+    - path: /compose/reference/top/
+      title: top
+    - path: /compose/reference/unpause/
+      title: unpause
+    - path: /compose/reference/up/
+      title: up
   - title: Daemon CLI (dockerd)
-    path: /engine/reference/commandline/dockerd/
+    path: engine/reference/commandline/dockerd/
-  - title: Machine (docker-machine) CLI
-    path: /machine/reference/
-    nosync: true
-  - title: Compose (docker-compose) CLI
-    path: /compose/reference/overview/
-    nosync: true
   - sectiontitle: DTR CLI
     section:
     - path: /reference/dtr/2.7/cli/
@@ -1126,7 +1139,6 @@ reference:
       title: uninstall-ucp
     - path: /reference/ucp/3.2/cli/upgrade/
       title: upgrade
-
 - sectiontitle: Application Programming Interfaces (APIs)
   section:
   - sectiontitle: Docker Engine API
@@ -1191,23 +1203,52 @@ reference:
         title: v1.18 reference
   - title: DTR API
     path: /reference/dtr/2.7/api/
-  - title: UCP API
-    path: /reference/ucp/3.2/api/
   - title: Registry API
     path: /registry/spec/api/
-    nosync: true
+  - title: Template API
-
+    path: /app-template/api-reference/
+  - title: UCP API
+    path: /reference/ucp/3.2/api/
 - sectiontitle: Drivers and specifications
   section:
-  - title: Image specification
+  - sectiontitle: Registry image manifests
-    path: /registry/spec/manifest-v2-2/
+    section:
-  - title: Machine drivers
+    - path: /registry/spec/manifest-v2-1/
-    path: /machine/drivers/os-base/
+      title: Image manifest v 2, schema 1
-  - title: Registry token authentication
+    - path: /registry/spec/manifest-v2-2/
-    path: /registry/spec/auth/
+      title: Image manifest v 2, schema 2
-  - title: Registry storage drivers
+    - path: /registry/spec/deprecated-schema-v1/
-    path: /registry/storage-drivers/
+      title: Update deprecated schema v1 images
-
+  - sectiontitle: Registry token authorization
+    section:
+    - path: /registry/spec/auth/
+      title: Docker Registry token authentication
+    - path: /registry/spec/auth/jwt/
+      title: Token authentication implementation
+    - path: /registry/spec/auth/oauth/
+      title: Oauth2 token authentication
+    - path: /registry/spec/auth/scope/
+      title: Token scope documentation
+    - path: /registry/spec/auth/token/
+      title: Token authentication specification  
+  - sectiontitle: Registry storage drivers
+    section:
+    - path: /registry/storage-drivers/
+      title: Storage driver overview
+    - path: /registry/storage-drivers/oss/
+      title: Aliyun OSS storage driver
+    - path: /registry/storage-drivers/filesystem/
+      title: Filesystem storage driver
+    - path: /registry/storage-drivers/gcs/
+      title: GCS storage driver
+    - path: /registry/storage-drivers/inmemory/
+      title: In-memory storage driver
+    - path: /registry/storage-drivers/azure/
+      title: Microsoft Azure storage driver
+    - path: /registry/storage-drivers/s3/
+      title: S3 storage driver
+    - path: /registry/storage-drivers/swift/
+      title: Swift storage driver
 - sectiontitle: Compliance control references
   section:
   - sectiontitle: NIST 800-53
@@ -1305,13 +1346,8 @@ manuals:
       title: Cluster file structure
     - path: /cluster/reference/envvars/
       title: Environment variables
-    - path: /cluster/reference/
-      title: Subcommands
   - sectiontitle: Docker Engine - Enterprise
     section:
-    - path: /ee/supported-platforms/
-      title: Install Docker Engine - Enterprise
-      nosync: true
     - title: Release notes
       path: /engine/release-notes/
   - sectiontitle: Universal Control Plane
@@ -1418,9 +1454,6 @@ manuals:
         path: /ee/admin/backup/back-up-ucp/
       - title: Restore UCP
         path: /ee/admin/restore/restore-ucp/
-      - title: CLI reference
-        path: /reference/ucp/3.2/cli/
-        nosync: true
     - sectiontitle: Authorize role-based access
       section:
       - path: /ee/ucp/authorization/
@@ -1509,10 +1542,6 @@ manuals:
             path: /ee/ucp/interlock/usage/canary/
           - title: Using context or path-based routing
             path: /ee/ucp/interlock/usage/context/
-          - title: Specifying a routing mode
-            path: /ee/ucp/interlock/usage/interlock-vip-mode/
-          - title: Using routing labels
-            path: /ee/ucp/interlock/usage/labels-reference/
           - title: Publishing a default host service
             path: /ee/ucp/interlock/usage/default-backend/
           - title: Specifying a routing mode
@@ -1573,9 +1602,6 @@ manuals:
           path: /ee/ucp/kubernetes/cluster-ingress/canary/
         - title: Implementing Persistent (sticky) Sessions
           path: /ee/ucp/kubernetes/cluster-ingress/sticky/
-    - title: API reference
-      path: /reference/ucp/3.2/api/
-      nosync: true
     - path: /ee/ucp/release-notes/
       title: Release notes
     - sectiontitle: Previous versions
@@ -2694,9 +2720,9 @@ manuals:
         - title: Repair a cluster
           path: /ee/dtr/admin/disaster-recovery/repair-a-cluster/
         - title: Create a backup
-          path: /ee/dtr/admin/disaster-recovery/create-a-backup/
+          path: /ee/admin/backup/back-up-dtr/
         - title: Restore from a backup
-          path: /ee/dtr/admin/disaster-recovery/restore-from-backup/
+          path: /ee/admin/restore/restore-dtr/
       - title: CLI reference
         path: /reference/dtr/2.7/cli/
         nosync: true
@@ -3760,9 +3786,6 @@ manuals:
     section:
     - path: /ee/docker-ee-architecture/
       title: Docker Enterprise Architecture
-    - path: /ee/supported-platforms/
-      title: Supported platforms
-      nosync: true
     - path: /ee/end-to-end-install/
       title: Deploy Docker Enterprise
     - path: /ee/upgrade/
@@ -3773,24 +3796,12 @@ manuals:
         title: Overview
       - path: /ee/admin/backup/back-up-swarm/
         title: Back up Docker Swarm
-      - path: /ee/admin/backup/back-up-ucp/
-        title: Back up UCP
-      - path: /ee/admin/backup/back-up-dtr/
-        title: Back up DTR
-      - path: /engine/reference/commandline/cluster_backup/
-        title: Back up clusters with Docker Cluster
     - sectiontitle: Restore Docker Enterprise
       section:
       - path: /ee/admin/restore/
         title: Overview
       - path: /ee/admin/restore/restore-swarm/
         title: Restore Docker Swarm
-      - path: /ee/admin/restore/restore-ucp/
-        title: Restore UCP
-      - path: /ee/admin/restore/restore-dtr/
-        title: Restore DTR
-      - path: /cluster/reference/restore/
-        title: Restore clusters with Docker Cluster
     - sectiontitle: Disaster Recovery
       section:
       - path: /ee/admin/disaster-recovery/
@@ -3815,28 +3826,10 @@ manuals:
     title: Images
   - path: /assemble/adv-backend-manage/
     title: Advanced Backend Management
-  - path: /engine/reference/commandline/assemble/
-    title: CLI reference
-- sectiontitle: Docker App
-  section:
 - path: /app/working-with-app/
-    title: Working with Docker App
+  title: Docker App
-  - path: /engine/reference/commandline/app/
-    title: CLI reference
-- sectiontitle: Docker Template
-  section:
-  - path: /app-template/working-with-template/
-    title: Working with Docker Template
-  - path: /app-template/api-reference/
-    title: API reference
-  - path: /engine/reference/commandline/template/
-    title: CLI reference
-- sectiontitle: Docker Buildx
-  section:
 - path: /buildx/working-with-buildx/
-    title: Working with Docker Buildx
+  title: Docker Buildx
-  - path: /engine/reference/commandline/buildx/
-    title: CLI reference
 - sectiontitle: Docker Compose
   section:
   - path: /compose/
@@ -3845,74 +3838,6 @@ manuals:
     title: Install Compose
   - path: /compose/gettingstarted/
     title: Getting started
-  - sectiontitle: Compose (docker-compose) CLI reference
-    section:
-    - path: /compose/reference/overview/
-      title: Overview of docker-compose CLI
-    - path: /compose/reference/envvars/
-      title: CLI environment variables
-    - path: /compose/completion/
-      title: Command-line completion
-    - path: /compose/reference/build/
-      title: build
-    - path: /compose/reference/bundle/
-      title: bundle
-    - path: /compose/reference/config/
-      title: config
-    - path: /compose/reference/create/
-      title: create
-    - path: /compose/reference/down/
-      title: down
-    - path: /compose/reference/events/
-      title: events
-    - path: /compose/reference/exec/
-      title: exec
-    - path: /compose/reference/help/
-      title: help
-    - path: /compose/reference/kill/
-      title: kill
-    - path: /compose/reference/logs/
-      title: logs
-    - path: /compose/reference/pause/
-      title: pause
-    - path: /compose/reference/port/
-      title: port
-    - path: /compose/reference/ps/
-      title: ps
-    - path: /compose/reference/pull/
-      title: pull
-    - path: /compose/reference/push/
-      title: push
-    - path: /compose/reference/restart/
-      title: restart
-    - path: /compose/reference/rm/
-      title: rm
-    - path: /compose/reference/run/
-      title: run
-    - path: /compose/reference/scale/
-      title: scale
-    - path: /compose/reference/start/
-      title: start
-    - path: /compose/reference/stop/
-      title: stop
-    - path: /compose/reference/top/
-      title: top
-    - path: /compose/reference/unpause/
-      title: unpause
-    - path: /compose/reference/up/
-      title: up
-  - sectiontitle: Compose file reference
-    section:
-    - path: /compose/compose-file/
-      title: Version 3
-    - path: /compose/compose-file/compose-file-v2/
-      title: Version 2
-    - path: /compose/compose-file/compose-file-v1/
-      title: Version 1
-    - path: /compose/compose-file/compose-versioning/
-      title: About versions and upgrading
-    - path: /compose/faq/
-      title: Frequently asked questions
   - path: /compose/bundles/
     title: Docker stacks and distributed application bundles
   - path: /compose/swarm/
@@ -3927,20 +3852,14 @@ manuals:
     title: Networking in Compose
   - path: /compose/production/
     title: Using Compose in production
-  - path: /compose/link-env-deprecated/
-    title: Link environment variables (deprecated)
   - path: /compose/startup-order/
     title: Control startup order
   - path: /compose/samples-for-compose/
     title: Sample apps with Compose
   - path: /release-notes/docker-compose/
     title: Docker Compose release notes
-- sectiontitle: Docker Context
-  section:
 - path: /engine/context/working-with-contexts/
-    title: Working with Docker Contexts
+  title: Docker Context
-  - path: /engine/reference/commandline/context/
-    title: CLI reference
 - sectiontitle: Docker Desktop for Mac
   section:
   - path: /docker-for-mac/
@@ -4067,6 +3986,8 @@ manuals:
       title: Trust chain
     - path: /docker-hub/publish/byol/
       title: Bring Your Own License (BYOL)
+- path: /app-template/working-with-template/
+  title: Docker Template
 - sectiontitle: Open-source projects
   section:
   - sectiontitle: Docker Notary
@@ -4125,48 +4046,6 @@ manuals:
       title: Compatibility
     - path: /registry/help/
       title: Getting help
-    - sectiontitle: Registry reference
-      section:
-      - path: /registry/spec/api/
-        title: Registry HTTP API v2
-      - sectiontitle: Registry image manifests
-        section:
-        - path: /registry/spec/manifest-v2-1/
-          title: Image manifest v 2, schema 1
-        - path: /registry/spec/manifest-v2-2/
-          title: Image manifest v 2, schema 2
-        - path: /registry/spec/deprecated-schema-v1/
-          title: Update deprecated schema v1 images
-      - sectiontitle: Registry storage drivers
-        section:
-        - path: /registry/storage-drivers/
-          title: Storage driver overview
-        - path: /registry/storage-drivers/oss/
-          title: Aliyun OSS storage driver
-        - path: /registry/storage-drivers/filesystem/
-          title: Filesystem storage driver
-        - path: /registry/storage-drivers/gcs/
-          title: GCS storage driver
-        - path: /registry/storage-drivers/inmemory/
-          title: In-memory storage driver
-        - path: /registry/storage-drivers/azure/
-          title: Microsoft Azure storage driver
-        - path: /registry/storage-drivers/s3/
-          title: S3 storage driver
-        - path: /registry/storage-drivers/swift/
-          title: Swift storage driver
-      - sectiontitle: Registry specifications
-        section:
-        - path: /registry/spec/auth/
-          title: Docker Registry token authentication
-        - path: /registry/spec/auth/jwt/
-          title: Token authentication implementation
-        - path: /registry/spec/auth/oauth/
-          title: Oauth2 token authentication
-        - path: /registry/spec/auth/scope/
-          title: Token scope documentation
-        - path: /registry/spec/auth/token/
-          title: Token authentication specification
 - path: /release-notes/
   title: Release notes
 - sectiontitle: Superseded products and tools

app-template/working-with-template.md

@@ -1,6 +1,6 @@
 ---
-title: Working with Docker Template (experimental)
+title: Docker Template
-description: Working with Docker Application Template
+description: Working with Docker Template
 keywords: Docker, application template, Application Designer,
 ---
 
@@ -26,7 +26,7 @@ given service, and writes the output to the `/project` mounted folder.
   definition.  It contains the name of the service, description, and available
 parameters such as ports, volumes, etc. For a complete list of parameters that
 are allowed, see [Docker Template API
-reference](/ee/app-template/api-reference).
+reference](/app-template/api-reference/).
 
 An _application template_ is a collection of one or more service templates. An
 application template generates a Dockerfile per service and only one Compose

app/working-with-app.md

@@ -1,5 +1,5 @@
 ---
-title: Working with Docker App (experimental)
+title: Docker App
 description: Learn about Docker App
 keywords: Docker App, applications, compose, orchestration
 ---

assemble/install.md

@@ -1,5 +1,5 @@
 ---
-title: Docker Assemble (experimental)
+title: Docker Assemble
 description: Installing Docker Assemble
 keywords: Assemble, Docker Enterprise, plugin, Spring Boot, .NET, c#, F#
 ---

buildx/working-with-buildx.md

@@ -1,5 +1,5 @@
 ---
-title: Working with Docker Buildx (experimental)
+title: Docker Buildx
 description: Working with Docker Buildx
 keywords: Docker, buildx, multi-arch
 ---

develop/dev-best-practices.md

@@ -78,34 +78,6 @@ keep image size small:
   standalone containers, consider migrating to use single-replica services, so
   that you can take advantage of these service-only features.
 
-## Use swarm services when possible
-
-- When possible, design your application with the ability to scale using swarm
-  services.
-- Even if you only need to run a single instance of your application, swarm
-  services provide several advantages over standalone containers. A service's
-  configuration is declarative, and Docker is always working to keep the
-  desired and actual state in sync.
-- Networks and volumes can be connected and disconnected from swarm services,
-  and Docker handles redeploying the individual service containers in a
-  non-disruptive way. Standalone containers need to be manually stopped, removed,
-  and recreated to accommodate configuration changes.
-- Several features, such as the ability to store
-  [secrets](/engine/swarm/secrets.md) and [configs](/engine/swarm/configs.md),
-  are only available to services rather than standalone containers. These
-  features allow you to keep your images as generic as possible and to avoid
-  storing sensitive data within the Docker images or containers themselves.
-- Let `docker stack deploy` handle any image pulls for you, instead of using
-  `docker pull`. This way, your deployment doesn't try to pull from nodes
-  that are down. Also, when new nodes are added to the swarm, images are
-  pulled automatically.
-
-There are limitations around sharing data amongst nodes of a swarm service.
-If you use [Docker for AWS](/docker-for-aws/persistent-data-volumes.md) or
-[Docker for Azure](/docker-for-azure/persistent-data-volumes.md), you can use the
-Cloudstor plugin to share data amongst your swarm service nodes. You can also
-write your application data into a separate database which supports simultaneous
-updates.
 
 ## Use CI/CD for testing and deployment
 

engine/context/working-with-contexts.md

@@ -1,7 +1,7 @@
 ---
-title: Working with Contexts
+title: Docker Context
-description: Learn about Docker Contexts
+description: Learn about Docker Context
-keywords: engine, contexts, cli, kubernetes
+keywords: engine, context, cli, kubernetes
 ---
 
 

get-docker.md

@@ -0,0 +1,39 @@
+---
+description: Home page for Get Docker
+keywords: Docker, documentation, manual
+landing: true
+title: Get Docker
+---
+
+<div class="component-container">
+    <!--start row-->
+    <div class="row">
+        <div class="col-sm-12 col-md-12 col-lg-4 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="docker-for-mac/"> <img src="../images/apple_48.svg" alt="Docker Desktop for Mac"> </a>
+                </div>
+                <h3 id="docker-for-mac"><a href="docker-for-mac/">Docker Desktop for Mac</a></h3>
+                <p>A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.</p>
+            </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-4 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="docker-for-windows/"> <img src="../images/windows_48.svg" alt="Docker Desktop for Windows"> </a>
+                </div>
+                <h3 id="docker-for-windows"><a href="docker-for-windows/">Docker Desktop for Windows</a></h3>
+                <p>A native Windows application which delivers all Docker tools to your Windows computer.</p>
+            </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-4 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="install/linux/ubuntu/"> <img src="../images/linux_48.svg" alt="Docker for Linux"> </a>
+                </div>
+                <h3 id="docker-for-linux"><a href="install/linux/ubuntu/">Docker for Linux</a></h3>
+                <p>Install Docker on a computer which already has a Linux distribution installed.</p>
+            </div>
+        </div>
+    </div>
+</div>

get-started/index.md

@@ -1,5 +1,5 @@
 ---
-title: "Get Started, Part 1: Orientation and setup"
+title: "Orientation and setup"
 keywords: get started, setup, orientation, quickstart, intro, concepts, containers, docker desktop
 description: Get oriented on some basics of Docker and install Docker Desktop.
 redirect_from:

get-started/nav.html

@@ -1,7 +1,7 @@
 <ul class="pagination">
-  <li {% if include.selected=="1"%}class="active"{% endif %}><a href="part1">1: Orientation and setup</a></li>
+  <li {% if include.selected=="1"%}class="active"{% endif %}><a href="part1">Orientation and setup</a></li>
-  <li {% if include.selected=="2"%}class="active"{% endif %}><a href="part2">2: Containerizing an application</a></li>
+  <li {% if include.selected=="2"%}class="active"{% endif %}><a href="part2">Containerizing an application</a></li>
-  <li {% if include.selected=="3"%}class="active"{% endif %}><a href="part3">3: Deploying to Kubernetes</a></li>
+  <li {% if include.selected=="3"%}class="active"{% endif %}><a href="part3">Deploying to Kubernetes</a></li>
-  <li {% if include.selected=="4"%}class="active"{% endif %}><a href="part4">4: Deploying to Swarm</a></li>
+  <li {% if include.selected=="4"%}class="active"{% endif %}><a href="part4">Deploying to Swarm</a></li>
-  <li {% if include.selected=="5"%}class="active"{% endif %}><a href="part5">5: Sharing images on Docker Hub</a></li>
+  <li {% if include.selected=="5"%}class="active"{% endif %}><a href="part5">Sharing images on Docker Hub</a></li>
 </ul>

get-started/part2.md

@@ -1,5 +1,5 @@
 ---
-title: "Get Started, Part 2: Containerizing an Application"
+title: "Containerizing an application"
 keywords: containers, images, dockerfiles, node, code, coding, build, push, run
 description: Learn how to create a Docker image by writing a Dockerfile, and use it to run a simple container.
 ---

get-started/part3.md

@@ -1,5 +1,5 @@
 ---
-title: "Get Started, Part 3: Deploying to Kubernetes"
+title: "Deploying to Kubernetes"
 keywords: kubernetes, pods, deployments, kubernetes services
 description: Learn how to describe and deploy a simple application on Kubernetes.
 ---
@@ -24,7 +24,7 @@ In order to validate that our containerized application works well on Kubernetes
 
 All containers in Kubernetes are scheduled as _pods_, which are groups of co-located containers that share some resources. Furthermore, in a realistic application we almost never create individual pods; instead, most of our workloads are scheduled as _deployments_, which are scalable groups of pods maintained automatically by Kubernetes. Lastly, all Kubernetes objects can and should be described in manifests called _Kubernetes YAML_ files; these YAML files describe all the components and configurations of your Kubernetes app, and can be used to easily create and destroy your app in any Kubernetes environment.
 
-1.  You already wrote a very basic Kubernetes YAML file in the first part of this tutorial; let's write a slightly more sophisticated one now, to run and manage our bulletin board. Place the following in a file called `bb.yaml`and save it in the same place you put the other yaml file.
+1.  You already wrote a very basic Kubernetes YAML file in the first part of this tutorial; let's write a slightly more sophisticated one now, to run and manage our bulletin board. Place the following in a file called `bb.yaml`:
 
     ```yaml
     apiVersion: apps/v1
@@ -125,8 +125,6 @@ At this point, we have successfully used Docker Desktop to deploy our applicatio
 
 In addition to deploying to Kubernetes, we have also described our application as a Kubernetes YAML file. This simple text file contains everything we need to create our application in a running state; we can check it into version control and share it with our colleagues, allowing us to distribute our applications to other clusters (like the testing and production clusters that probably come after our development environments) easily.
 
-[On to Part 4 >>](part4.md){: class="button outline-btn" style="margin-bottom: 30px; margin-right: 100%"}
-
 ## Kubernetes References
 
 Further documentation for all new Kubernetes objects used in this article are available here:

get-started/part4.md

@@ -1,5 +1,5 @@
 ---
-title: "Get Started, Part 4: Deploying to Swarm"
+title: "Deploying to Swarm"
 keywords: swarm, swarm services, stacks
 description: Learn how to describe and deploy a simple application on Docker Swarm.
 ---

get-started/part5.md

@@ -1,5 +1,5 @@
 ---
-title: "Get Started, Part 5: Sharing Images on Docker Hub"
+title: "Sharing images on Docker Hub"
 keywords: docker hub, push, images
 description: Learn how to share images on Docker Hub.
 ---
@@ -57,5 +57,3 @@ At this point, you've set up your Docker Hub account and have connected it to yo
 Now that your image is available on Docker Hub, you'll be able to run it anywhere; if you try to use it on a new cluster that doesn't have it yet, Docker will automatically try and download it from Docker Hub. By moving images around in this way, we no longer need to install any dependencies except Docker and our orchestrator on the machines we want to run our software on; the dependencies of our containerized applications are completely encapsulated and isolated within our images, which we can share via Docker Hub in the manner above.
 
 Another thing to keep in mind: at the moment, we've only pushed your image to Docker Hub; what about your Dockerfiles, Kube YAML and stack files? A crucial best practice is to keep these in version control, perhaps alongside your source code for your application, and add a link or note in your Docker Hub repository description indicating where these files can be found, preserving the record not only of how your image was built, but how it's meant to be run as a full application.
-
-

reference.md

@@ -18,9 +18,9 @@ various APIs, CLIs, and file formats.
 
 | CLI                                                           | Description                                                                                                     |
 |:--------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------|
-| [Engine CLI](/engine/reference/commandline/cli/)              | The main CLI for Docker, includes all `docker` and [`dockerd`](/engine/reference/commandline/dockerd/) commands |
+| [Docker CLI](/engine/reference/commandline/cli/)              | The main CLI for Docker, includes all `docker` commands |
 | [Compose CLI](/compose/reference/overview/)                   | The CLI for Docker Compose, which allows you to build and run multi-container applications                      |
-| [Machine CLI](/machine/reference/)                            | Manages virtual machines that are pre-configured to run Docker                                                  |
+| [Daemon CLI (dockerd)](/engine/reference/commandline/dockerd/)                            | Persistent process that manages containers                                                 |
 | [DTR CLI](/reference/dtr/{{ site.dtr_version }}/cli/index.md) | Deploy and manage Docker Trusted Registry                                                                       |
 | [UCP CLI](/reference/ucp/{{ site.ucp_version }}/cli/index.md) | Deploy and manage Universal Control Plane                                                                       |
 
@@ -29,17 +29,16 @@ various APIs, CLIs, and file formats.
 | API                                                   | Description                                                                            |
 |:------------------------------------------------------|:---------------------------------------------------------------------------------------|
 | [Engine API](/engine/api/)                            | The main API for Docker, provides programmatic access to a daemon |
-| [Registry API](/registry/spec/api/)                   | Facilitates distribution of images to the engine                                       |
 | [DTR API](/reference/dtr/{{ site.dtr_version }}/api/) | Provides programmatic access to a Docker Trusted Registry deployment                   |
+| [Registry API](/registry/spec/api/)                   | Facilitates distribution of images to the engine                                       |
+| [Template API](app-template/api-reference)| Allows users to create new Docker applications by using a library of templates.|
 | [UCP API](/reference/ucp/{{ site.ucp_version }}/api/) | Provides programmatic access to a Universal Control Plane deployment                   |
 
-
 ## Drivers and specifications
 
 | Driver                                                 | Description                                                                        |
 |:-------------------------------------------------------|:-----------------------------------------------------------------------------------|
 | [Image specification](/registry/spec/manifest-v2-2/)   | Describes the various components of a Docker image                                 |
-| [Machine drivers](/machine/drivers/os-base/)           | Enables support for given cloud providers when provisioning resources with Machine |
 | [Registry token authentication](/registry/spec/auth/)  | Outlines the Docker registry authentication scheme                                 |
 | [Registry storage drivers](/registry/storage-drivers/) | Enables support for given cloud providers when storing images with Registry        |