From 03436c430045f5f61686bf97002d05c7bc2d7875 Mon Sep 17 00:00:00 2001
From: Joao Fernandes <joao.fernandes@docker.com>
Date: Mon, 7 Nov 2016 11:30:09 -0800
Subject: [PATCH] Update DTR 2.1 front matter

---
 datacenter/dtr/2.1/architecture.md            | 19 +++++----------
 .../dtr/2.1/configure/config-general.md       | 17 +++++--------
 .../dtr/2.1/configure/config-security.md      | 17 +++++--------
 .../dtr/2.1/configure/config-storage.md       | 17 +++++--------
 datacenter/dtr/2.1/configure/configuration.md | 17 +++++--------
 datacenter/dtr/2.1/configure/index.md         | 19 +++++----------
 .../2.1/configure/use-your-certificates.md    | 17 +++++--------
 .../backups-and-disaster-recovery.md          | 21 ++++++----------
 datacenter/dtr/2.1/high-availability/index.md | 20 +++++-----------
 datacenter/dtr/2.1/high-availability/menu.md  | 12 ----------
 datacenter/dtr/2.1/index.md                   | 21 +++++-----------
 datacenter/dtr/2.1/install/index.md           | 24 +++++--------------
 .../dtr/2.1/install/install-dtr-offline.md    | 21 ++++++----------
 datacenter/dtr/2.1/install/license.md         | 21 +++++-----------
 datacenter/dtr/2.1/install/menu.md            | 12 ----------
 .../dtr/2.1/install/system-requirements.md    | 20 +++++-----------
 datacenter/dtr/2.1/install/uninstall.md       | 19 +++++----------
 datacenter/dtr/2.1/install/upgrade/index.md   | 20 +++++-----------
 datacenter/dtr/2.1/install/upgrade/menu.md    | 12 ----------
 .../dtr/2.1/install/upgrade/upgrade-major.md  | 22 ++++++-----------
 datacenter/dtr/2.1/menu.md                    | 11 ---------
 .../dtr/2.1/monitor-troubleshoot/index.md     | 20 +++++-----------
 .../dtr/2.1/monitor-troubleshoot/menu.md      | 12 ----------
 .../2.1/monitor-troubleshoot/troubleshoot.md  | 22 +++++------------
 datacenter/dtr/2.1/release-notes/index.md     | 19 +++++----------
 datacenter/dtr/2.1/release-notes/menu.md      | 12 ----------
 .../2.1/release-notes/prior-release-notes.md  | 20 +++++-----------
 .../2.1/repos-and-images/delete-an-image.md   | 22 +++++------------
 datacenter/dtr/2.1/repos-and-images/index.md  | 19 +++++----------
 datacenter/dtr/2.1/repos-and-images/menu.md   | 12 ----------
 .../dtr/2.1/repos-and-images/pull-an-image.md | 20 +++++-----------
 .../dtr/2.1/repos-and-images/push-an-image.md | 22 +++++------------
 datacenter/dtr/2.1/support.md                 | 20 +++++++---------
 .../user-management/create-and-manage-orgs.md | 20 ++++++----------
 .../create-and-manage-teams.md                | 20 ++++++----------
 .../create-and-manage-users.md                | 19 +++++----------
 datacenter/dtr/2.1/user-management/index.md   | 20 +++++-----------
 datacenter/dtr/2.1/user-management/menu.md    | 12 ----------
 .../2.1/user-management/permission-levels.md  | 19 +++++----------
 39 files changed, 193 insertions(+), 516 deletions(-)
 delete mode 100644 datacenter/dtr/2.1/high-availability/menu.md
 delete mode 100644 datacenter/dtr/2.1/install/menu.md
 delete mode 100644 datacenter/dtr/2.1/install/upgrade/menu.md
 delete mode 100644 datacenter/dtr/2.1/menu.md
 delete mode 100644 datacenter/dtr/2.1/monitor-troubleshoot/menu.md
 delete mode 100644 datacenter/dtr/2.1/release-notes/menu.md
 delete mode 100644 datacenter/dtr/2.1/repos-and-images/menu.md
 delete mode 100644 datacenter/dtr/2.1/user-management/menu.md

diff --git a/datacenter/dtr/2.1/architecture.md b/datacenter/dtr/2.1/architecture.md
index a612b6b1ff..fa10f875b5 100644
--- a/datacenter/dtr/2.1/architecture.md
+++ b/datacenter/dtr/2.1/architecture.md
@@ -1,16 +1,9 @@
-<!--[metadata]>
-+++
-title = "Architecture"
-description = "Learn about the architecture of Docker Trusted Registry."
-keywords = ["docker, registry, dtr, architecture"]
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_architecture"
-weight=20
-+++
-<![end-metadata]-->
-
-# DTR architecture
+---
+title: DTR architecture
+description: Learn about the architecture of Docker Trusted Registry.
+keywords:
+- docker, registry, dtr, architecture
+---
 
 Docker Trusted Registry (DTR) is a Dockerized application that runs on a Docker
 Universal Control Plane cluster.
diff --git a/datacenter/dtr/2.1/configure/config-general.md b/datacenter/dtr/2.1/configure/config-general.md
index 4295830cac..69f62bde65 100644
--- a/datacenter/dtr/2.1/configure/config-general.md
+++ b/datacenter/dtr/2.1/configure/config-general.md
@@ -1,14 +1,9 @@
-+++
-title = "Configure general settings"
-description = "Configure general settings for Docker Trusted Registry"
-keywords = ["docker, documentation, about, technology, understanding, enterprise, hub, general, domain name, HTTP, HTTPS ports, registry"]
-[menu.main]
-parent="workw_dtr_configure"
-identifier="dtr_configure_general"
-weight=3
-+++
-
-# Configure general settings
+---
+title: Configure general settings
+description: Configure general settings for Docker Trusted Registry
+keywords:
+- docker, documentation, about, technology, understanding, enterprise, hub, general, domain name, HTTP, HTTPS ports, Notary, registry
+---
 
 This document describes the general settings you need to configure.
 
diff --git a/datacenter/dtr/2.1/configure/config-security.md b/datacenter/dtr/2.1/configure/config-security.md
index 81f07be162..dce82162f8 100644
--- a/datacenter/dtr/2.1/configure/config-security.md
+++ b/datacenter/dtr/2.1/configure/config-security.md
@@ -1,14 +1,9 @@
-+++
-title = "Security configuration"
-description = "Security configuration for Docker Trusted Registry"
-keywords = ["docker, documentation, about, technology, understanding, configuration, security, enterprise, hub, registry"]
-[menu.main]
-parent="workw_dtr_configure"
-identifier="dtr_configure_security"
-weight=4
-+++
-
-# Security configuration
+---
+title: Security configuration
+description: Security configuration for Docker Trusted Registry
+keywords:
+- docker, documentation, about, technology, understanding, configuration, security, enterprise, hub, registry
+---
 
 This document describes the security settings you need to configure.
 
diff --git a/datacenter/dtr/2.1/configure/config-storage.md b/datacenter/dtr/2.1/configure/config-storage.md
index 7c8271af9d..94433b7340 100644
--- a/datacenter/dtr/2.1/configure/config-storage.md
+++ b/datacenter/dtr/2.1/configure/config-storage.md
@@ -1,14 +1,9 @@
-+++
-title = "Storage configuration"
-description = "Storage configuration for Docker Trusted Registry"
-keywords = ["docker, documentation, about, technology, understanding, configuration, storage, storage drivers, Azure, S3, Swift,  enterprise, hub, registry"]
-[menu.main]
-parent="workw_dtr_configure"
-identifier="dtr_configure_storage"
-weight=5
-+++
-
-# Storage configuration
+---
+title: Storage configuration
+description: Storage configuration for Docker Trusted Registry
+keywords:
+- docker, documentation, about, technology, understanding, configuration, storage, storage drivers, Azure, S3, Swift,  enterprise, hub, registry
+---
 
 After installing Docker Trusted Registry, one of your first tasks is to
 designate and configure the Trusted Registry storage backend. This document provides the following:
diff --git a/datacenter/dtr/2.1/configure/configuration.md b/datacenter/dtr/2.1/configure/configuration.md
index 56619993ad..09b7960830 100644
--- a/datacenter/dtr/2.1/configure/configuration.md
+++ b/datacenter/dtr/2.1/configure/configuration.md
@@ -1,14 +1,9 @@
-+++
-title = "Configuration overview"
-description = "Configuration overview for Docker Trusted Registry"
-keywords = ["docker, documentation, about, technology, understanding, enterprise, hub,  registry"]
-[menu.main]
-parent="workw_dtr_configure"
-identifier="dtr_configuration"
-weight=2
-+++
-
-# Configure overview
+---
+title: Configuration overview
+description: Configuration overview for Docker Trusted Registry
+keywords:
+- docker, documentation, about, technology, understanding, enterprise, hub,  registry
+---
 
 When you first install Docker Trusted Registry, you need to configure it. Use
 this overview to see what you can configure.
diff --git a/datacenter/dtr/2.1/configure/index.md b/datacenter/dtr/2.1/configure/index.md
index 6dc309ca76..5d494ef633 100644
--- a/datacenter/dtr/2.1/configure/index.md
+++ b/datacenter/dtr/2.1/configure/index.md
@@ -1,16 +1,9 @@
-<!--[metadata]>
-+++
-title = "Configuration"
-description = "Trusted Registry configuration options"
-keywords = ["docker, documentation, about, technology, install, enterprise, hub, CS engine, Docker Trusted Registry, configure, storage, backend, drivers"]
-[menu.main]
-parent="workw_dtr"
-identifier="workw_dtr_configure"
-weight=50
-+++
-<![end-metadata]-->
-
-# Configure DTR
+---
+title: Configuration of Docker Trusted Registry
+description: Trusted Registry configuration options
+keywords:
+- docker, documentation, about, technology, install, enterprise, hub, CS engine, Docker Trusted Registry, configure, storage, backend, drivers
+---
 
 This section includes the following topics:
 
diff --git a/datacenter/dtr/2.1/configure/use-your-certificates.md b/datacenter/dtr/2.1/configure/use-your-certificates.md
index 6b15a47dc6..48189fb4e8 100644
--- a/datacenter/dtr/2.1/configure/use-your-certificates.md
+++ b/datacenter/dtr/2.1/configure/use-your-certificates.md
@@ -1,14 +1,9 @@
-+++
-title = "Use your own certificates"
-description = "Learn how to configure Docker Trusted Registry to use your own certificates"
-keywords = ["Universal Control Plane, UCP, certificate, authentiation, tls"]
-[menu.main]
-parent="workw_dtr_configure"
-identifier="dtr-configure-certs"
-weight=0
-+++
-
-# Use your own certificates
+---
+title: Use your own certificates
+description: Trusted Registry configuration options
+keywords:
+- docker, documentation, about, technology, install, enterprise, hub, CS engine, Docker Trusted Registry, configure, storage, backend, drivers
+---
 
 By default the DTR services are exposed using HTTPS, to ensure all
 communications between clients and DTR is encrypted. Since DTR
diff --git a/datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md b/datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md
index 764bc8d8e6..7ce2e1476b 100644
--- a/datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md
+++ b/datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md
@@ -1,17 +1,10 @@
-<!--[metadata]>
-+++
-title = "Backups and disaster recovery"
-description = "Learn how to backup your Docker Trusted Registry cluster, and to recover your cluster from an existing backup."
-keywords = ["docker, registry, high-availability, backup, recovery"]
-[menu.main]
-parent="dtr_menu_high_availability"
-identifier="dtr_backup_disaster_recovery"
-weight=10
-+++
-<![end-metadata]-->
-
-
-# Backups and disaster recovery
+---
+title: Backups and disaster recovery
+description: Learn how to backup your Docker Trusted Registry cluster, and to recover
+  your cluster from an existing backup.
+keywords:
+- docker, registry, high-availability, backup, recovery
+---
 
 When you decide to start using Docker Trusted Registry on a production
 setting, you should [configure it for high availability](index.md).
diff --git a/datacenter/dtr/2.1/high-availability/index.md b/datacenter/dtr/2.1/high-availability/index.md
index 8e9d719486..95bb705c51 100644
--- a/datacenter/dtr/2.1/high-availability/index.md
+++ b/datacenter/dtr/2.1/high-availability/index.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/high-availability/high-availability/"]
-title = "Set up high availability"
-description = "Learn how to set up Docker Trusted Registry for high availability."
-keywords = ["docker, registry, high-availability, backup, recovery"]
-[menu.main]
-parent="dtr_menu_high_availability"
-identifier="dtr_high_availability"
-weight=0
-+++
-<![end-metadata]-->
-
-# Set up high availability
+---
+title: Set up high availability
+description: Learn how to set up Docker Trusted Registry for high availability.
+keywords:
+- docker, registry, high-availability, backup, recovery
+---
 
 Docker Trusted Registry (DTR) is designed for high availability.
 
diff --git a/datacenter/dtr/2.1/high-availability/menu.md b/datacenter/dtr/2.1/high-availability/menu.md
deleted file mode 100644
index 87031dacfd..0000000000
--- a/datacenter/dtr/2.1/high-availability/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "High-availability"
-description = "Learn how to set up Docker Trusted Registry for high availability."
-keywords = ["docker, registry, high-availability, backup, recovery"]
-type = "menu"
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_menu_high_availability"
-weight=70
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/index.md b/datacenter/dtr/2.1/index.md
index c5cb047a4f..083fc714d2 100644
--- a/datacenter/dtr/2.1/index.md
+++ b/datacenter/dtr/2.1/index.md
@@ -1,18 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-hub-enterprise/",
-          "/docker-trusted-registry/overview/"]
-title = "Docker Trusted Registry overview"
-description = "Learn how to install, configure, and use Docker Trusted Registry."
-keywords = ["docker, registry, repository, images"]
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_overview"
-weight=0
-+++
-<![end-metadata]-->
-
-# Docker Trusted Registry overview
+---
+description: Learn how to install, configure, and use Docker Trusted Registry.
+keywords:
+- docker, registry, repository, images
+title: Docker Trusted Registry overview
+---
 
 Docker Trusted Registry (DTR) is the enterprise-grade image storage solution
 from Docker. You install it behind your firewall so that you can securely store
diff --git a/datacenter/dtr/2.1/install/index.md b/datacenter/dtr/2.1/install/index.md
index 6be29b09e7..738d29bc18 100644
--- a/datacenter/dtr/2.1/install/index.md
+++ b/datacenter/dtr/2.1/install/index.md
@@ -1,21 +1,9 @@
-<!--[metadata]>
-+++
-aliases = [ "/docker-trusted-registry/install/dtr-ami-byol-launch/",
-            "/docker-trusted-registry/install/dtr-ami-bds-launch/",
-            "/docker-trusted-registry/install/dtr-vhd-azure/",
-            "/docker-trusted-registry/install/install-dtr/"]
-title = "Install Docker Trusted Registry"
-description = "Learn how to install Docker Trusted Registry for production."
-keywords = ["docker, dtr, registry, install"]
-[menu.main]
-parent="dtr-menu-install"
-identifier="dtr_install_production"
-weight=20
-+++
-<![end-metadata]-->
-
-
-# Install Docker Trusted Registry
+---
+title: Install Docker Trusted Registry
+description: Learn how to install Docker Trusted Registry for production.
+keywords:
+- docker, dtr, registry, install
+---
 
 Docker Trusted Registry (DTR) is a containerized application that runs on a
 swarm managed by Docker Universal Control Plane (UCP). It can be installed
diff --git a/datacenter/dtr/2.1/install/install-dtr-offline.md b/datacenter/dtr/2.1/install/install-dtr-offline.md
index 0909267452..1217f5bdd3 100644
--- a/datacenter/dtr/2.1/install/install-dtr-offline.md
+++ b/datacenter/dtr/2.1/install/install-dtr-offline.md
@@ -1,17 +1,10 @@
-<!--[metadata]>
-+++
-title = "Install offline"
-description = "Learn how to install Docker Trusted Registry on a machine with no internet access."
-keywords = ["docker, registry, install, offline"]
-[menu.main]
-parent="dtr-menu-install"
-identifier="dtr_install_offline"
-weight=30
-+++
-<![end-metadata]-->
-
-
-# Install DTR offline
+---
+title: Install Docker Trusted Registry offline
+description: Learn how to install Docker Trusted Registry on a machine with no internet
+  access.
+keywords:
+- docker, registry, install, offline
+---
 
 The procedure to install Docker Trusted Registry on a node is the same,
 whether that node has access to the internet or not.
diff --git a/datacenter/dtr/2.1/install/license.md b/datacenter/dtr/2.1/install/license.md
index dab91114c8..d47aa57033 100644
--- a/datacenter/dtr/2.1/install/license.md
+++ b/datacenter/dtr/2.1/install/license.md
@@ -1,18 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/license/"]
-title = "License DTR"
-description = "Learn how to license your Docker Trusted Registry installation."
-keywords = ["docker, dtr, install, license"]
-[menu.main]
-parent="dtr-menu-install"
-identifier="dtr_license"
-weight=31
-+++
-<![end-metadata]-->
-
-
-# License DTR
+---
+title: License Docker Trusted Registry
+description: Learn how to license your Docker Trusted Registry installation.
+keywords:
+- docker, dtr, install, license
+---
 
 By default, you don't need to license your Docker Trusted Registry. When
 installing DTR, it automatically starts using the same license file used on
diff --git a/datacenter/dtr/2.1/install/menu.md b/datacenter/dtr/2.1/install/menu.md
deleted file mode 100644
index e79d2b19e0..0000000000
--- a/datacenter/dtr/2.1/install/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "Installation"
-description = "Trusted Registry Installation Overview"
-keywords = ["docker, documentation, about, technology, install, enterprise, hub, CS engine, Docker Trusted Registry"]
-type = "menu"
-[menu.main]
-parent="workw_dtr"
-identifier="dtr-menu-install"
-weight=30
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/install/system-requirements.md b/datacenter/dtr/2.1/install/system-requirements.md
index 5b8ed80f7f..aee896d343 100644
--- a/datacenter/dtr/2.1/install/system-requirements.md
+++ b/datacenter/dtr/2.1/install/system-requirements.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-title = "System requirements"
-description = "Learn about the system requirements for installing Docker Trusted Registry."
-keywords = ["docker, DTR, architecture, requirements"]
-[menu.main]
-parent="dtr-menu-install"
-identifier="dtr_system_requirements"
-weight=0
-+++
-<![end-metadata]-->
-
-
-# DTR system requirements
+---
+title: Docker Trusted Registry system requirements
+description: Learn about the system requirements for installing Docker Trusted Registry.
+keywords:
+- docker, DTR, architecture, requirements
+---
 
 Docker Trusted Registry can be installed on-premises or on the cloud.
 Before installing, be sure your infrastructure has these requirements.
diff --git a/datacenter/dtr/2.1/install/uninstall.md b/datacenter/dtr/2.1/install/uninstall.md
index 576a2d9f16..d8204ad468 100644
--- a/datacenter/dtr/2.1/install/uninstall.md
+++ b/datacenter/dtr/2.1/install/uninstall.md
@@ -1,16 +1,9 @@
-<!--[metadata]>
-+++
-title = "Uninstall"
-description = "Learn how to uninstall your Docker Trusted Registry installation."
-keywords = ["docker, dtr, install, uninstall"]
-[menu.main]
-parent="dtr-menu-install"
-identifier="dtr_uninstall"
-weight=50
-+++
-<![end-metadata]-->
-
-# Uninstall Docker Trusted Registry
+---
+title: Uninstall Docker Trusted Registry
+description: Learn how to uninstall your Docker Trusted Registry installation.
+keywords:
+- docker, dtr, install, uninstall
+---
 
 Use the `remove` command, to remove a DTR replica from a cluster.
 To uninstall a DTR cluster you remove all DTR replicas one at a time.
diff --git a/datacenter/dtr/2.1/install/upgrade/index.md b/datacenter/dtr/2.1/install/upgrade/index.md
index 18ce8eb691..46db662418 100644
--- a/datacenter/dtr/2.1/install/upgrade/index.md
+++ b/datacenter/dtr/2.1/install/upgrade/index.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/install/upgrade/upgrade-minor/"]
-title = "Upgrade from 2.0.0"
-description = "Learn how to upgrade your Docker Trusted Registry to a new minor version or patch release."
-keywords = ["docker, dtr, upgrade, install"]
-[menu.main]
-parent="menu_dtr_upgrade"
-identifier="dtr_upgrade_minor"
-weight=10
-+++
-<![end-metadata]-->
-
-# Upgrade from 2.0.0
+---
+title: Upgrade from 2.0.0
+description: Learn how to upgrade your Docker Trusted Registry to a new minor version or patch release.
+keywords:
+- docker, dtr, upgrade, install
+---
 
 <!-- beta: remove after this goes to GA -->
 
diff --git a/datacenter/dtr/2.1/install/upgrade/menu.md b/datacenter/dtr/2.1/install/upgrade/menu.md
deleted file mode 100644
index 55f888ae16..0000000000
--- a/datacenter/dtr/2.1/install/upgrade/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "Upgrade"
-description = "Learn how to upgrade your Docker Trusted Registry."
-keywords = ["docker, dtr, upgrade, install"]
-type = "menu"
-[menu.main]
-parent="dtr-menu-install"
-identifier="menu_dtr_upgrade"
-weight=40
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/install/upgrade/upgrade-major.md b/datacenter/dtr/2.1/install/upgrade/upgrade-major.md
index 1b98460833..debfb42696 100644
--- a/datacenter/dtr/2.1/install/upgrade/upgrade-major.md
+++ b/datacenter/dtr/2.1/install/upgrade/upgrade-major.md
@@ -1,18 +1,10 @@
-<!--[metadata]>
-+++
-draft=true
-aliases = ["/docker-trusted-registry/install/upgrade/"]
-title = "Upgrade from 1.4.3"
-description = "Learn how to upgrade your Docker Trusted Registry to the latest major release."
-keywords = ["docker, dtr, upgrade, install"]
-[menu.main]
-parent="menu_dtr_upgrade"
-identifier="dtr_upgrade_major"
-weight=0
-+++
-<![end-metadata]-->
-
-# Upgrade from DTR 1.4.3
+---
+title: Upgrade from 1.4.3
+description: Learn how to upgrade your Docker Trusted Registry to the latest major
+  release.
+keywords:
+- docker, dtr, upgrade, install
+---
 
 The first step in upgrading to Docker Trusted Registry (DTR) 2.0, is ensuring
 you are running DTR 1.4.3. If that's not the case, start by upgrading your
diff --git a/datacenter/dtr/2.1/menu.md b/datacenter/dtr/2.1/menu.md
deleted file mode 100644
index 7557cd492d..0000000000
--- a/datacenter/dtr/2.1/menu.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--[metadata]>
-+++
-title = "Docker Trusted Registry"
-description = "Docker Trusted Registry"
-keywords = ["docker, documentation, about, technology, understanding, enterprise, hub,  registry"]
-type = "menu"
-[menu.main]
-identifier="workw_dtr"
-weight=-63
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/monitor-troubleshoot/index.md b/datacenter/dtr/2.1/monitor-troubleshoot/index.md
index eec0978265..2bd862818f 100644
--- a/datacenter/dtr/2.1/monitor-troubleshoot/index.md
+++ b/datacenter/dtr/2.1/monitor-troubleshoot/index.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/monitor-troubleshoot/monitor/"]
-title = "Monitor DTR"
-description = "Learn how to monitor your DTR installation."
-keywords = ["docker, registry, monitor, troubleshoot"]
-[menu.main]
-parent="dtr_menu_monitor_troubleshoot"
-identifier="dtr_monitor"
-weight=0
-+++
-<![end-metadata]-->
-
-# Monitor DTR
+---
+title: Monitor Docker Trusted Registry
+description: Learn how to monitor your DTR installation.
+keywords:
+- docker, registry, monitor, troubleshoot
+---
 
 Docker Trusted Registry is a Dockerized application. To monitor it, you can
 use the same tools and techniques you're already using to monitor other
diff --git a/datacenter/dtr/2.1/monitor-troubleshoot/menu.md b/datacenter/dtr/2.1/monitor-troubleshoot/menu.md
deleted file mode 100644
index 26770fbe56..0000000000
--- a/datacenter/dtr/2.1/monitor-troubleshoot/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "Monitor and troubleshoot"
-description = "Learn how to monitor and troubleshoot your DTR cluster"
-keywords = ["docker, registry, monitor, troubleshoot"]
-type = "menu"
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_menu_monitor_troubleshoot"
-weight=60
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot.md b/datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot.md
index 71673485a9..3a1726603b 100644
--- a/datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot.md
+++ b/datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot.md
@@ -1,19 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/adminguide/"]
-title = "Troubleshoot DTR"
-description = "Learn how to troubleshoot your DTR installation."
-keywords = ["docker, registry, monitor, troubleshoot"]
-[menu.main]
-parent="dtr_menu_monitor_troubleshoot"
-identifier="dtr_troubleshoot"
-weight=10
-+++
-<![end-metadata]-->
-
-# Troubleshoot DTR
-
-## Overlay networking
+---
+title: Troubleshoot Docker Trusted Registry
+description: Learn how to troubleshoot your DTR installation.
+keywords:
+- docker, registry, monitor, troubleshoot
+---
 
 High availability in DTR depends on having overlay networking working in UCP.
 To manually test that overlay networking is working in UCP run the following
diff --git a/datacenter/dtr/2.1/release-notes/index.md b/datacenter/dtr/2.1/release-notes/index.md
index 751d66d455..025e1c35c1 100644
--- a/datacenter/dtr/2.1/release-notes/index.md
+++ b/datacenter/dtr/2.1/release-notes/index.md
@@ -1,17 +1,10 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/release-notes/release-notes/"]
-title = "Trusted Registry release notes"
-description = "Docker Trusted Registry release notes "
-keywords = ["docker, documentation, about, technology, understanding, enterprise, hub, registry, release notes, Docker Trusted Registry"]
-[menu.main]
-parent="dtr_menu_release_notes"
-identifier="dtr_release_notes"
-weight=0
-+++
-<![end-metadata]-->
+---
+title: Docker Trusted Registry release notes
+keywords:
+description: Docker Trusted Registry release notes
+- docker, documentation, about, technology, understanding, enterprise, hub, registry, release notes, Docker Trusted Registry
+---
 
-# Docker Trusted Registry release notes
 
 Here you can learn about new features, bug fixes, breaking changes and
 known issues for each DTR version.
diff --git a/datacenter/dtr/2.1/release-notes/menu.md b/datacenter/dtr/2.1/release-notes/menu.md
deleted file mode 100644
index 00da7ae928..0000000000
--- a/datacenter/dtr/2.1/release-notes/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "Release notes"
-description = "Learn about the latest versions of Docker Trusted Registry."
-keywords = ["docker, dtr, release notes, upgrade"]
-type = "menu"
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_menu_release_notes"
-weight=110
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/release-notes/prior-release-notes.md b/datacenter/dtr/2.1/release-notes/prior-release-notes.md
index 18b870afdb..41330f7afd 100644
--- a/datacenter/dtr/2.1/release-notes/prior-release-notes.md
+++ b/datacenter/dtr/2.1/release-notes/prior-release-notes.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/prior-release-notes/"]
-title = "Prior Trusted Registry release notes"
-description = "Archived release notes for Docker Trusted Registry"
-keywords = ["docker, documentation, about, technology, understanding, enterprise, hub, registry, Docker Trusted Registry, release"]
-[menu.main]
-parent="dtr_menu_release_notes"
-identifier="dtr_prior_release_notes"
-weight=10
-+++
-<![end-metadata]-->
-
-# DTR release notes archive
+---
+title: DTR release notes archive
+description: Archived release notes for Docker Trusted Registry
+keywords:
+- docker, documentation, about, technology, understanding, enterprise, hub, registry, Docker Trusted Registry, release
+---
 
 This document contains the release notes for all versions of Docker Trusted
 Registry.
diff --git a/datacenter/dtr/2.1/repos-and-images/delete-an-image.md b/datacenter/dtr/2.1/repos-and-images/delete-an-image.md
index 81652a7bc4..f940cbb761 100644
--- a/datacenter/dtr/2.1/repos-and-images/delete-an-image.md
+++ b/datacenter/dtr/2.1/repos-and-images/delete-an-image.md
@@ -1,19 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/soft-garbage/",
-          "/docker-trusted-registry/repos-and-images/delete-images/"]
-title = "Delete an image"
-description = "Learn how to delete images from your repositories on Docker Trusted Registry."
-keywords = ["docker, registry, repository, delete, image"]
-[menu.main]
-parent="dtr_menu_repos_and_images"
-identifier="dtr_delete_images"
-weight=30
-+++
-<![end-metadata]-->
-
-
-# Delete an image
+---
+title: Delete an image
+description: Learn how to delete images from your repositories on Docker Trusted Registry.
+keywords:
+- docker, registry, repository, delete, image
+---
 
 To delete an image, go to the **DTR web UI**, and navigate to the image
 **repository** you want to delete. In the **Tags** tab, select all the image
diff --git a/datacenter/dtr/2.1/repos-and-images/index.md b/datacenter/dtr/2.1/repos-and-images/index.md
index 17f03846f5..9bec8f9398 100644
--- a/datacenter/dtr/2.1/repos-and-images/index.md
+++ b/datacenter/dtr/2.1/repos-and-images/index.md
@@ -1,16 +1,9 @@
-<!--[metadata]>
-+++
-title = "Configure your Docker Engine"
-description = "Learn how to configure your Docker Engine to push and pull images from Docker Trusted Registry."
-keywords = ["docker, registry, TLS, certificates"]
-[menu.main]
-parent="dtr_menu_repos_and_images"
-identifier="dtr_configure_engine"
-weight=0
-+++
-<![end-metadata]-->
-
-# Configure your Docker Engine
+---
+description: Learn how to configure your Docker Engine to push and pull images from Docker Trusted Registry.
+keywords:
+- docker, registry, TLS, certificates
+title: Configure your Docker Engine
+---
 
 By default Docker Engine uses TLS when pushing and pulling images to an
 image registry like Docker Trusted Registry.
diff --git a/datacenter/dtr/2.1/repos-and-images/menu.md b/datacenter/dtr/2.1/repos-and-images/menu.md
deleted file mode 100644
index 8093070b5e..0000000000
--- a/datacenter/dtr/2.1/repos-and-images/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "Repositories and images"
-description = "Learn how to manage your repositories and images on Docker Trusted Registry."
-keywords = ["docker, registry, management, repository, image"]
-type = "menu"
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_menu_repos_and_images"
-weight=90
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/repos-and-images/pull-an-image.md b/datacenter/dtr/2.1/repos-and-images/pull-an-image.md
index 244831ae8e..6707a73d43 100644
--- a/datacenter/dtr/2.1/repos-and-images/pull-an-image.md
+++ b/datacenter/dtr/2.1/repos-and-images/pull-an-image.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/quick-start/"]
-title = "Pull an image"
-description = "Learn how to pull an image from Docker Trusted Registry."
-keywords = ["docker, registry, images, pull"]
-[menu.main]
-parent="dtr_menu_repos_and_images"
-identifier="dtr_pull_image"
-weight=10
-+++
-<![end-metadata]-->
-
-# Pull an image from DTR
+---
+title: Pull an image from DTR
+description: Learn how to pull an image from Docker Trusted Registry.
+keywords:
+- docker, registry, images, pull
+---
 
 Pulling an image from Docker Trusted Registry is the same as pulling an image
 from Docker Hub. Since DTR is secure by default, you always need to authenticate
diff --git a/datacenter/dtr/2.1/repos-and-images/push-an-image.md b/datacenter/dtr/2.1/repos-and-images/push-an-image.md
index 37df3cf156..f9e7acca75 100644
--- a/datacenter/dtr/2.1/repos-and-images/push-an-image.md
+++ b/datacenter/dtr/2.1/repos-and-images/push-an-image.md
@@ -1,19 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/repos-and-images/create-repo/",
-          "/docker-trusted-registry/userguide/",
-          "/docker-trusted-registry/repos-and-images/push-and-pull-images/"]
-title = "Push an image"
-description = "Learn how to push an image to Docker Trusted Registry."
-keywords = ["docker, registry, images, pull"]
-[menu.main]
-parent="dtr_menu_repos_and_images"
-identifier="dtr_push_image"
-weight=20
-+++
-<![end-metadata]-->
-
-# Push an image to DTR
+---
+description: Learn how to push an image to Docker Trusted Registry.
+keywords:
+- docker, registry, images, pull
+title: Push an image to DTR
+---
 
 Pushing an image to Docker Trusted Registry is the same as pushing an image
 to Docker Hub.
diff --git a/datacenter/dtr/2.1/support.md b/datacenter/dtr/2.1/support.md
index 69e3952bb2..4176395041 100644
--- a/datacenter/dtr/2.1/support.md
+++ b/datacenter/dtr/2.1/support.md
@@ -1,15 +1,11 @@
-<!--[metadata]>
-+++
-title = "Get support"
-description="Your Docker subscription gives you access to prioritized support. You can file tickets via email, your the support portal."
-keywords = ["Docker, support", "help"]
-[menu.main]
-parent="workw_dtr"
-weight=120
-+++
-<![end-metadata]-->
-
-# Get support
+---
+title: Get support for DTR
+description: Your Docker subscription gives you access to prioritized support. You
+  can file tickets via email, your the support portal.
+keywords:
+- Docker, support
+- help
+---
 
 Your Docker Data Center, or Docker Trusted Registry subscription gives you
 access to prioritized support. The service levels depend on your subscription.
diff --git a/datacenter/dtr/2.1/user-management/create-and-manage-orgs.md b/datacenter/dtr/2.1/user-management/create-and-manage-orgs.md
index 07c143ef0e..811c7c14a6 100644
--- a/datacenter/dtr/2.1/user-management/create-and-manage-orgs.md
+++ b/datacenter/dtr/2.1/user-management/create-and-manage-orgs.md
@@ -1,16 +1,10 @@
-<!--[metadata]>
-+++
-title = "Create and manage organizations"
-description = "Learn how to set up organizations to enforce security in Docker Trusted Registry."
-keywords = ["docker, registry, security, permissions, organizations"]
-[menu.main]
-parent="dtr_menu_user_management"
-identifier="dtr-create-organizations"
-weight = 20
-+++
-<![end-metadata]-->
-
-# Create and manage organizations
+---
+title: Create and manage organizations
+description: Learn how to set up organizations to enforce security in Docker Trusted
+  Registry.
+keywords:
+- docker, registry, security, permissions, organizations
+---
 
 When a user creates a repository, only that user has permissions to make changes
 to the repository.
diff --git a/datacenter/dtr/2.1/user-management/create-and-manage-teams.md b/datacenter/dtr/2.1/user-management/create-and-manage-teams.md
index 2fd97342c8..ec526fb17f 100644
--- a/datacenter/dtr/2.1/user-management/create-and-manage-teams.md
+++ b/datacenter/dtr/2.1/user-management/create-and-manage-teams.md
@@ -1,16 +1,10 @@
-<!--[metadata]>
-+++
-title = "Create and manage teams"
-description = "Learn how to manage teams to enforce fine-grain access control in Docker Trusted Registry."
-keywords = ["docker, registry, security, permissions, teams"]
-[menu.main]
-parent="dtr_menu_user_management"
-identifier="dtr-create-teams"
-weight = 30
-+++
-<![end-metadata]-->
-
-# Create and manage teams
+---
+title: Create and manage teams
+description: Learn how to manage teams to enforce fine-grain access control in Docker
+  Trusted Registry.
+keywords:
+- docker, registry, security, permissions, teams
+---
 
 You can extend the user's default permissions by granting them fine-grain
 permissions over image repositories. You do this by adding the user to a team.
diff --git a/datacenter/dtr/2.1/user-management/create-and-manage-users.md b/datacenter/dtr/2.1/user-management/create-and-manage-users.md
index d06bfb323d..e160de6206 100644
--- a/datacenter/dtr/2.1/user-management/create-and-manage-users.md
+++ b/datacenter/dtr/2.1/user-management/create-and-manage-users.md
@@ -1,16 +1,9 @@
-<!--[metadata]>
-+++
-title = "Create and manage users"
-description = "Learn how to manage user permissions in Docker Trusted Registry."
-keywords = ["docker, registry, security, permissions, users"]
-[menu.main]
-parent="dtr_menu_user_management"
-identifier="dtr-create-users"
-weight = 10
-+++
-<![end-metadata]-->
-
-# Create and manage users
+---
+title: Create and manage users
+description: Learn how to manage user permissions in Docker Trusted Registry.
+keywords:
+- docker, registry, security, permissions, users
+---
 
 When using the Docker Datacenter built-in authentication, you can create users
 to grant them fine-grained permissions.
diff --git a/datacenter/dtr/2.1/user-management/index.md b/datacenter/dtr/2.1/user-management/index.md
index 9a4944fd85..eb1c09353a 100644
--- a/datacenter/dtr/2.1/user-management/index.md
+++ b/datacenter/dtr/2.1/user-management/index.md
@@ -1,17 +1,9 @@
-<!--[metadata]>
-+++
-aliases = ["/docker-trusted-registry/accounts/"]
-title = "Authentication and authorization"
-description = "Learn about the permission levels available on Docker Trusted Registry."
-keywords = ["docker, registry, security, permissions, users"]
-[menu.main]
-parent="dtr_menu_user_management"
-identifier="dtr-authentication-authorization"
-weight=0
-+++
-<![end-metadata]-->
-
-# Authentication and authorization
+---
+title: Authentication and authorization
+description: Learn about the permission levels available on Docker Trusted Registry.
+keywords:
+- docker, registry, security, permissions, users
+---
 
 With DTR you get to control which users have access to your image repositories.
 
diff --git a/datacenter/dtr/2.1/user-management/menu.md b/datacenter/dtr/2.1/user-management/menu.md
deleted file mode 100644
index 83efa3de8b..0000000000
--- a/datacenter/dtr/2.1/user-management/menu.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--[metadata]>
-+++
-title = "User management"
-description = "Learn how to manage user permissions on Docker Trusted Registry."
-keywords = ["docker, registry, management, security, users"]
-type = "menu"
-[menu.main]
-parent="workw_dtr"
-identifier="dtr_menu_user_management"
-weight=80
-+++
-<![end-metadata]-->
diff --git a/datacenter/dtr/2.1/user-management/permission-levels.md b/datacenter/dtr/2.1/user-management/permission-levels.md
index 36881a6981..d19fdf6cb2 100644
--- a/datacenter/dtr/2.1/user-management/permission-levels.md
+++ b/datacenter/dtr/2.1/user-management/permission-levels.md
@@ -1,16 +1,9 @@
-<!--[metadata]>
-+++
-title = "Permission levels"
-description = "Learn about the permission levels available in Docker Trusted Registry."
-keywords = ["docker, registry, security, permissions"]
-[menu.main]
-parent="dtr_menu_user_management"
-identifier="dtr-permission-levels"
-weight = 40
-+++
-<![end-metadata]-->
-
-# Permission levels
+---
+title: Permission levels
+description: Learn about the permission levels available in Docker Trusted Registry.
+keywords:
+- docker, registry, security, permissions
+---
 
 Docker Trusted Registry allows you to define fine-grain permissions over image
 repositories.