Navigation under "Reference" and "Manuals," Registry warning, "Latest" UCP/DTR (#5469)

* Revamp Product Manuals and Reference

* Nips and tucks

* Lose the snark

.gitignore

@@ -7,3 +7,4 @@ _site/**
 CNAME
 Gemfile.lock
 _samples/library/**
+_kbase/**

_config.yml

@@ -23,6 +23,8 @@ docker_ee_version: "17.06"
 compose_version: "1.17.0"
 machine_version: "0.13.0"
 distribution_version: "2.6"
+dtr_version: "2.4"
+ucp_version: "2.2"
 
 ucp_versions:
   - version: "2.2"

_data/toc.yaml

@@ -207,6 +207,7 @@ guides:
           title: Overview
         - path: /develop/sdk/examples/
           title: SDK and API examples
+
 - sectiontitle: Configure networking
   section:
   - path: /engine/userguide/networking/
@@ -536,6 +537,7 @@ guides:
     title: Where to chat or get help
   - path: /opensource/doc-style/
     title: Style guide for Docker documentation
+
 - sectiontitle:
   section:
   - path: /docsarchive/
@@ -544,17 +546,20 @@ guides:
     path: /hackathon/
 
 reference:
+- sectiontitle: File formats
+  section:
   - title: Dockerfile reference
     path: /engine/reference/builder/
+  - title: Compose file reference
+    path: /compose/compose-file/
+    nosync: true
+  - title: Cloud stack file reference
+    path: /docker-cloud/apps/stack-yaml-reference/
+    nosync: true
 
-- sectiontitle: Daemon CLI (dockerd)
+- sectiontitle: Command-Line Interfaces (CLIs)
   section:
-  - title: Stable
+  - sectiontitle: Docker CLI (docker)
-    path: /engine/reference/commandline/dockerd/
-  - title: Edge
-    path: /edge/engine/reference/commandline/dockerd/
-
-- sectiontitle: Docker CLI
     section:
     - sectiontitle: Stable
       section:
@@ -1252,7 +1257,27 @@ reference:
           title: docker volume rm
       - path: /edge/engine/reference/commandline/wait/
         title: docker wait
+  - sectiontitle: Daemon CLI (dockerd)
+    section:
+    - title: Daemon CLI (dockerd) - Stable
+      path: /engine/reference/commandline/dockerd/
+    - title: Daemon CLI (dockerd) - Edge
+      path: /edge/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
+  - title: Trusted Registry CLI
+    path: /datacenter/dtr/2.4/reference/cli/
+    nosync: true
+  - title: Universal Control Plane CLI
+    path: /datacenter/ucp/2.2/reference/cli/
+    nosync: true
 
+- sectiontitle: Application Programming Interfaces (APIs)
+  section:
   - sectiontitle: Docker Engine API
     section:
     - path: /engine/api/
@@ -1299,28 +1324,27 @@ reference:
         title: v1.19 reference
       - path: /engine/api/v1.18/
         title: v1.18 reference
-
-- sectiontitle: Docker Enterprise Edition references
-  section:
   - title: Trusted Registry API
     path: /datacenter/dtr/2.4/reference/api/
-  - title: Trusted Registry CLI
+  - title: Registry API
-    path: /datacenter/dtr/2.4/reference/cli/
+    path: /registry/spec/api/
     nosync: true
-  - title: Universal Control Plane CLI
-    path: /datacenter/ucp/2.2/reference/cli/
-    nosync: true
-
-- sectiontitle: Docker Cloud references
-  section:
   - title: Cloud API
     path: /apidocs/docker-cloud/
     nosync: true
-  - title: Cloud stack file reference
-    path: /docker-cloud/apps/stack-yaml-reference/
-    nosync: true
 
-- sectiontitle: Compliance control reference
+- sectiontitle: Drivers and specifications
+  section:
+  - title: Image specification
+    path: /registry/spec/manifest-v2-2/
+  - title: Machine drivers
+    path: /machine/drivers/os-base/
+  - title: Registry token authentication
+    path: /registry/spec/auth/
+  - title: Registry storage drivers
+    path: /registry/storage-drivers/
+
+- sectiontitle: Compliance control references
   section:
   - sectiontitle: NIST 800-53
     section:
@@ -1363,22 +1387,8 @@ reference:
     - path: /compliance/reference/800-53/sa/
       title: System and services acquisition
 
-- sectiontitle: Compose references
-  section:
-  - title: Compose file reference
-    path: /compose/compose-file/
-    nosync: true
-  - title: Compose (docker-compose) CLI
-    path: /compose/reference/overview/
-    nosync: true
 
-- title: Machine (docker-machine) CLI
-  path: /machine/reference/
-  nosync: true
 
-- title: Registry API
-  path: /registry/spec/api/
-  nosync: true
 
 samples:
 - path: /samples/#tutorial-labs
@@ -2583,28 +2593,6 @@ manuals:
             title: API v1.3.3
         - path: /datacenter/dtr/2.0/support/
           title: Get support
-- sectiontitle: Commercially supported Docker Engine
-  section:
-  - sectiontitle: 1.13
-    section:
-    - path: /cs-engine/1.13/
-      title: Install
-    - path: /cs-engine/1.13/upgrade/
-      title: Upgrade
-    - path: /cs-engine/1.13/release-notes/
-      title: Release notes
-  - sectiontitle: 1.12
-    section:
-    - path: /cs-engine/1.12/
-      title: Install
-    - path: /cs-engine/1.12/upgrade/
-      title: Upgrade
-    - sectiontitle: Release notes
-      section:
-      - path: /cs-engine/1.12/release-notes/release-notes/
-        title: CS Engine release notes
-      - path: /cs-engine/1.12/release-notes/prior-release-notes/
-        title: Prior CS Engine release notes
 - sectiontitle: Docker Cloud
   section:
   - path: /docker-cloud/
@@ -3007,6 +2995,38 @@ manuals:
     title: Migrate from Boot2Docker to Machine
   - path: /release-notes/docker-machine/
     title: Docker Machine release notes
+- sectiontitle: Docker Store
+  section:
+  - path: /docker-store/
+    title: Docker Store overview
+  - path: /docker-store/publish/
+    title: Publish content on Docker Store
+  - path: /docker-store/trustchain/
+    title: Docker Store Trust Chain
+  - path: /docker-store/faq/
+    title: Consumer FAQs
+- sectiontitle: Docker Hub
+  section:
+  - path: /docker-hub/
+    title: Overview of Docker Hub
+  - path: /docker-hub/accounts/
+    title: Use Docker Hub with Docker ID
+  - path: /docker-hub/orgs/
+    title: Teams & organizations
+  - path: /docker-hub/repos/
+    title: Repositories on Docker Hub
+  - path: /docker-hub/builds/
+    title: Automated builds
+  - path: /docker-hub/webhooks/
+    title: Webhooks for automated builds
+  - path: /docker-hub/bitbucket/
+    title: Automated builds with Bitbucket
+  - path: /docker-hub/github/
+    title: Automated builds from GitHub
+  - path: /docker-hub/official_repos/
+    title: Official repositories on Docker Hub
+- sectiontitle: Open-source projects
+  section:
   - sectiontitle: Docker Notary
     section:
     - path: /notary/getting_started/
@@ -3103,16 +3123,6 @@ manuals:
           title: Token scope documentation
         - path: /registry/spec/auth/token/
           title: Token authentication specification
-- sectiontitle: Docker Store
-  section:
-  - path: /docker-store/
-    title: Docker Store overview
-  - path: /docker-store/publish/
-    title: Publish content on Docker Store
-  - path: /docker-store/trustchain/
-    title: Docker Store Trust Chain
-  - path: /docker-store/faq/
-    title: Consumer FAQs
 - sectiontitle: Release notes
   section:
     - path: /release-notes/
@@ -3153,26 +3163,28 @@ manuals:
       nosync: true
 - sectiontitle: Superseded products and tools
   section:
-  - sectiontitle: Docker Hub
+  - sectiontitle: Commercially supported Docker Engine
     section:
-    - path: /docker-hub/
+    - sectiontitle: 1.13
-      title: Overview of Docker Hub
+      section:
-    - path: /docker-hub/accounts/
+      - path: /cs-engine/1.13/
-      title: Use Docker Hub with Docker ID
+        title: Install
-    - path: /docker-hub/orgs/
+      - path: /cs-engine/1.13/upgrade/
-      title: Teams & organizations
+        title: Upgrade
-    - path: /docker-hub/repos/
+      - path: /cs-engine/1.13/release-notes/
-      title: Repositories on Docker Hub
+        title: Release notes
-    - path: /docker-hub/builds/
+    - sectiontitle: 1.12
-      title: Automated builds
+      section:
-    - path: /docker-hub/webhooks/
+      - path: /cs-engine/1.12/
-      title: Webhooks for automated builds
+        title: Install
-    - path: /docker-hub/bitbucket/
+      - path: /cs-engine/1.12/upgrade/
-      title: Automated builds with Bitbucket
+        title: Upgrade
-    - path: /docker-hub/github/
+      - sectiontitle: Release notes
-      title: Automated builds from GitHub
+        section:
-    - path: /docker-hub/official_repos/
+        - path: /cs-engine/1.12/release-notes/release-notes/
-      title: Official repositories on Docker Hub
+          title: CS Engine release notes
+        - path: /cs-engine/1.12/release-notes/prior-release-notes/
+          title: Prior CS Engine release notes
   - sectiontitle: Docker Swarm (standalone)
     section:
     - path: /swarm/overview/

index.md

@@ -338,9 +338,9 @@ the industry to modernize all applications. Docker EE Advanced comes with enterp
         <div class="col-sm-12 col-md-12 col-lg-4 block">
             <div class="component">
                 <div class="component-icon">
-                    <a href="datacenter/ucp/2.2/guides/"> <img src="../images/UCP_48.svg" alt="Universal Control Plane"> </a>
+                    <a href="datacenter/ucp/{{ site.ucp_version }}/guides/"> <img src="../images/UCP_48.svg" alt="Universal Control Plane"> </a>
                 </div>
-                <h3 id="ucp"><a href="datacenter/ucp/2.2/guides/">Universal Control Plane</a></h3>
+                <h3 id="ucp"><a href="datacenter/ucp/{{ site.ucp_version }}/guides/">Universal Control Plane</a></h3>
                 <p>(UCP) Manage a cluster of on-premise Docker hosts like a single machine with this enterprise product.</p>
             </div>
         </div>
@@ -348,9 +348,9 @@ the industry to modernize all applications. Docker EE Advanced comes with enterp
         <div class="col-sm-12 col-md-12 col-lg-4 block">
             <div class="component">
                 <div class="component-icon">
-                    <a href="datacenter/dtr/2.3/guides/"> <img src="../images/dtr_48.svg" alt="Docker Trusted Registry"> </a>
+                    <a href="datacenter/dtr/{{ site.dtr_version }}/guides/"> <img src="../images/dtr_48.svg" alt="Docker Trusted Registry"> </a>
                 </div>
-                <h3 id="dtr"><a href="datacenter/dtr/2.3/guides/">Docker Trusted Registry</a></h3>
+                <h3 id="dtr"><a href="datacenter/dtr/{{ site.dtr_version }}/guides/">Docker Trusted Registry</a></h3>
                 <p>(DTR) An enterprise image storage solution you can install behind a firewall to manage images and access.</p>
             </div>
         </div>

reference.md

@@ -22,8 +22,8 @@ various APIs, CLIs, and file formats.
 | [Engine CLI](/engine/reference/commandline/cli/)          | The main CLI for Docker, includes all `docker` and [`dockerd`](/engine/reference/commandline/dockerd/) 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                                                   |
-| [UCP CLI](/datacenter/ucp/2.2/reference/cli/index.md) | Deploy and manage Universal Control Plane                                                                       |
+| [UCP CLI](/datacenter/ucp/{{ site.ucp_version }}/reference/cli/index.md) | Deploy and manage Universal Control Plane                                                                       |
-| [DTR CLI](/datacenter/dtr/2.4/reference/cli/index.md) | Deploy and manage Docker Trusted Registry                                                                                       |
+| [DTR CLI](/datacenter/dtr/{{ site.dtr_version }}/reference/cli/index.md) | Deploy and manage Docker Trusted Registry                                                                                       |
 
 ## Application programming interfaces (APIs)
 
@@ -44,3 +44,9 @@ various APIs, CLIs, and file formats.
 | [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        |
+
+## Compliance control reference
+
+| Reference | Description |
+| --------- | ----------- |
+| [NIST 800-53 control reference](/compliance/reference/800-53/) | All of the NIST 800-53 Rev. 4 controls applicable to Docker Enterprise Edition can be referenced in this section. |

registry/index.md

@@ -6,6 +6,16 @@ redirect_from:
 title: Docker Registry
 ---
 
+> Looking for Docker Trusted Registry?
+>
+> Docker Trusted Registry (DTR) is a commercial product that enables complete
+> image management workflow, featuring LDAP integration, image signing,
+> security scanning, and integration with Universal Control Plane. DTR is
+> offered as an add-on to Docker Enterprise subscriptions of Standard or
+> higher.
+>
+> [Go to Docker Trusted Registry](/datacenter/dtr/{{ site.dtr_version }}/guides/){: class="button outline-btn" }
+
 ## What it is
 
 The Registry is a stateless, highly scalable server side application that stores
@@ -34,7 +44,7 @@ into [Docker Trusted Registry](/datacenter/dtr/2.1/guides/index.md).
 
 The Registry is compatible with Docker engine **version 1.6.0 or higher**.
 
-## TL;DR
+## Basic commands
 
 Start your registry