Refactor DTR urls

_data/toc.yaml

@@ -743,91 +743,93 @@ toc:
       title: Release Notes
   - sectiontitle: Docker Trusted Registry 2.1
     section:
-    - path: /datacenter/dtr/2.1/
+    - path: /datacenter/dtr/2.1/guides/
       title: Docker Trusted Registry overview
-    - path: /datacenter/dtr/2.1/architecture/
+    - path: /datacenter/dtr/2.1/guides/architecture/
       title: Architecture
     - sectiontitle: Installation
       section:
-      - path: /datacenter/dtr/2.1/install/system-requirements/
+      - path: /datacenter/dtr/2.1/guides/install/system-requirements/
         title: System requirements
-      - path: /datacenter/dtr/2.1/install/
+      - path: /datacenter/dtr/2.1/guides/install/
         title: Install Docker Trusted Registry
-      - path: /datacenter/dtr/2.1/install/install-offline/
+      - path: /datacenter/dtr/2.1/guides/install/install-offline/
         title: Install offline
-      - path: /datacenter/dtr/2.1/install/license/
+      - path: /datacenter/dtr/2.1/guides/install/license/
         title: License your deployment
-      - path: /datacenter/dtr/2.1/install/upgrade/
+      - path: /datacenter/dtr/2.1/guides/install/upgrade/
         title: Upgrade
-      - path: /datacenter/dtr/2.1/install/uninstall/
+      - path: /datacenter/dtr/2.1/guides/install/uninstall/
         title: Uninstall
-      - sectiontitle: docker/dtr image reference
-        section:
-        - path: /datacenter/dtr/2.1/reference/
-          title: Overview
-        - path: /datacenter/dtr/2.1/reference/backup/
-          title: backup
-        - path: /datacenter/dtr/2.1/reference/dumpcerts/
-          title: dumpcerts
-        - path: /datacenter/dtr/2.1/reference/images/
-          title: images
-        - path: /datacenter/dtr/2.1/reference/install/
-          title: install
-        - path: /datacenter/dtr/2.1/reference/join/
-          title: join
-        - path: /datacenter/dtr/2.1/reference/reconfigure/
-          title: reconfigure
-        - path: /datacenter/dtr/2.1/reference/remove/
-          title: remove
-        - path: /datacenter/dtr/2.1/reference/restore/
-          title: restore
-        - path: /datacenter/dtr/2.1/reference/upgrade/
-          title: upgrade
     - sectiontitle: Configuration
       section:
-      - path: /datacenter/dtr/2.1/configure/
+      - path: /datacenter/dtr/2.1/guides/configure/
         title: Use your own certificates
-      - path: /datacenter/dtr/2.1/configure/configure-storage/
+      - path: /datacenter/dtr/2.1/guides/configure/configure-storage/
         title: Storage configuration
     - sectiontitle: Monitor and troubleshoot
       section:
-      - path: /datacenter/dtr/2.1/monitor-troubleshoot/
+      - path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/
         title: Monitor DTR
-      - path: /datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot/
+      - path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/troubleshoot/
         title: Troubleshoot DTR
     - sectiontitle: High-availability
       section:
-      - path: /datacenter/dtr/2.1/high-availability/
+      - path: /datacenter/dtr/2.1/guides/high-availability/
         title: Set up high availability
-      - path: /datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery/
+      - path: /datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery/
         title: Backups and disaster recovery
     - sectiontitle: User management
       section:
-      - path: /datacenter/dtr/2.1/user-management/
+      - path: /datacenter/dtr/2.1/guides/user-management/
         title: Authentication and authorization
-      - path: /datacenter/dtr/2.1/user-management/create-and-manage-users/
+      - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-users/
         title: Create and manage users
-      - path: /datacenter/dtr/2.1/user-management/create-and-manage-orgs/
+      - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-orgs/
         title: Create and manage organizations
-      - path: /datacenter/dtr/2.1/user-management/create-and-manage-teams/
+      - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-teams/
         title: Create and manage teams
-      - path: /datacenter/dtr/2.1/user-management/permission-levels/
+      - path: /datacenter/dtr/2.1/guides/user-management/permission-levels/
         title: Permission levels
     - sectiontitle: Repositories and images
       section:
-      - path: /datacenter/dtr/2.1/repos-and-images/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/
         title: Configure your Docker Engine
-      - path: /datacenter/dtr/2.1/repos-and-images/pull-an-image/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/pull-an-image/
         title: Pull an image
-      - path: /datacenter/dtr/2.1/repos-and-images/push-an-image/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/push-an-image/
         title: Push an image
-      - path: /datacenter/dtr/2.1/repos-and-images/delete-an-image/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/delete-an-image/
         title: Delete an image
-    - path: /apidocs/v2.1.0
-      title: DTR API
-    - path: /datacenter/dtr/2.1/release-notes/
+    - sectiontitle: API and CLI reference
+      section:
+      - path: /datacenter/dtr/2.1/reference/api/
+        title: API reference
+      - sectiontitle: CLI reference
+        section:
+        - path: /datacenter/dtr/2.1/reference/cli/
+          title: Overview
+        - path: /datacenter/dtr/2.1/reference/cli/backup/
+          title: backup
+        - path: /datacenter/dtr/2.1/reference/cli/dumpcerts/
+          title: dumpcerts
+        - path: /datacenter/dtr/2.1/reference/cli/images/
+          title: images
+        - path: /datacenter/dtr/2.1/reference/cli/install/
+          title: install
+        - path: /datacenter/dtr/2.1/reference/cli/join/
+          title: join
+        - path: /datacenter/dtr/2.1/reference/cli/reconfigure/
+          title: reconfigure
+        - path: /datacenter/dtr/2.1/reference/cli/remove/
+          title: remove
+        - path: /datacenter/dtr/2.1/reference/cli/restore/
+          title: restore
+        - path: /datacenter/dtr/2.1/reference/cli/upgrade/
+          title: upgrade
+    - path: /datacenter/dtr/2.1/guides/release-notes/
       title: Release notes
-    - path: /datacenter/dtr/2.1/support/
+    - path: /datacenter/dtr/2.1/guides/support/
       title: Get support
 - sectiontitle: Docker Cloud
   section:

datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery.md

@@ -52,7 +52,7 @@ When creating a backup, the resulting .tar file contains sensitive information
 like private keys. You should ensure the backups are stored securely.
 
 You can check the
-[reference documentation](../reference/backup.md), for the
+[reference documentation](../../reference/cli/backup.md), for the
 backup command to learn about all the available flags.
 
 As an example, to create a backup of a DTR node, you can use:
@@ -99,7 +99,7 @@ consideration whether your DTR installation is configured to store images on
 the filesystem or using a cloud provider.
 
 You can check the
-[reference documentation](../reference/backup.md), for the
+[reference documentation](../../reference/cli/backup.md), for the
 backup command to learn about all the available flags.
 
 

datacenter/dtr/2.1/guides/install/index.md

@@ -20,7 +20,7 @@ infrastructure has all the [requirements DTR needs to run](system-requirements.m
 
 Since DTR requires Docker Universal Control Plane (UCP)
 to run, you need to install UCP on all the nodes where you plan to install DTR.
-[Learn how to install UCP](/datacenter/ucp/2.0/guides/installation/install.md).
+[Learn how to install UCP](/datacenter/ucp/2.0/guides/installation/index.md).
 
 Make sure all the nodes you plan on installing DTR are being managed by UCP.
 
@@ -47,7 +47,7 @@ DTR. `--ucp-insecure-tls` tells the installer to trust the certificates used
 by UCP.
 
 The install command has other flags for customizing DTR at install time.
-Check the [reference documentation to learn more](../reference/install.md).
+Check the [reference documentation to learn more](../../reference/cli/install.md).
 
 
 ## Step 4. Check that DTR is running
@@ -126,5 +126,5 @@ replicas:
 
 ## See also
 
-* [Install DTR offline](install-dtr-offline.md)
-* [Upgrade DTR](upgrade/upgrade-major.md)
+* [Install DTR offline](install-offline.md)
+* [Upgrade DTR](upgrade.md)

datacenter/dtr/2.1/guides/install/uninstall.md

@@ -14,7 +14,7 @@ The remove command:
 * Deletes all DTR volumes.
 
 To see what options are available in the uninstall command, check the
-[uninstall command reference](../reference/remove.md), or run:
+[uninstall command reference](../../reference/cli/remove.md), or run:
 
 ```bash
 $ docker run -it --rm docker/dtr:2.1.0-beta3 remove --help

datacenter/dtr/2.1/guides/install/upgrade.md

@@ -1,5 +1,5 @@
 ---
-title: Upgrade
+title: Upgrade DTR
 description: Learn how to upgrade your Docker Trusted Registry
 keywords:
 - docker, dtr, upgrade, install
@@ -17,7 +17,7 @@ business peak hours to ensure the impact on your business is close to none.
 ## Step 1. Upgrade DTR to 2.0
 
 Make sure you're running DTR 2.0. If that's not the case, [upgrade your
-installation to the 2.0 version](upgrade-major.md).
+installation to the 2.0 version](/datacenter/dtr/2.0/install/upgrade/upgrade-major.md).
 
 ## Step 2. Upgrade DTR
 
@@ -36,7 +36,7 @@ To upgrade DTR you use the `upgrade` command.
 
     If the node you're upgrading doesn't have access to the internet, you can
     use a machine with internet connection to
-    [pull all the DTR images](../install-offline.md).
+    [pull all the DTR images](install-offline.md).
 
 4.  Run the upgrade command.
 
@@ -50,9 +50,9 @@ To upgrade DTR you use the `upgrade` command.
 
     By default the upgrade command runs in interactive mode and prompts you for
     any necessary information. You can also check the
-    [reference documentation](../reference/index.md) for other existing flags.
+    [reference documentation](../../reference/cli/index.md) for other existing flags.
 
 ## Where to go next
 
 * [System requirements](system-requirements.md)
-* [Monitor DTR](../../monitor-troubleshoot/index.md)
+* [Monitor DTR](..//monitor-troubleshoot/index.md)

datacenter/dtr/2.1/guides/release-notes.md

@@ -8,7 +8,7 @@ keywords:
 Here you can learn about new features, bug fixes, breaking changes and
 known issues for each DTR version.
 
-You can then use [the upgrade instructions](../install/upgrade.md),
+You can then use [the upgrade instructions](install/upgrade.md),
 to upgrade your installation to the latest release.
 
 ## DTR 2.1 Beta 3