/enterprise -> /ee (#415)

* /enterprise -> /ee * /datacenter/dtr/2.5 -> /ee/dtr/ * /datacenter/ucp/3.0->/ee/ucp * Fix configs * Fix broken images * Remove unused images for DTR * Remove unused images for UCP * Add a few redirects to avoid breaking beta exercises
2018-01-11 10:45:27 -08:00 · 2018-01-11 10:45:27 -08:00 · 9a4fdf9476
parent d9d05a6ee6
commit 9a4fdf9476
484 changed files with 269 additions and 870 deletions
--- a/_config.yml
+++ b/_config.yml
@ -31,7 +31,7 @@ ucp_version: "3.0"

 ucp_versions:
  - version: "3.0"
-    path: /datacenter/ucp/3.0/guides/
+    path: /ee/ucp/
    latest: true
  - version: "2.2"
    path: /datacenter/ucp/2.2/guides/
@ -44,7 +44,7 @@ ucp_versions:

 dtr_versions:
  - version: "2.5"
-    path: /datacenter/dtr/2.5/guides/
+    path: /ee/dtr/
    latest: true
  - version: "2.4"
    path: /datacenter/dtr/2.4/guides/
@ -151,7 +151,7 @@ defaults:
      dtr_latest_image: "docker/dtr:2.5.0"
      enterprise: true
  - scope:
-      path: "datacenter/dtr/2.5"
+      path: "ee/dtr"
    values:
      dtr_org: "docker"
      dtr_repo: "dtr"
@ -187,7 +187,7 @@ defaults:
      ucp_version: "1.1"
      dtr_version: "2.0"
  - scope:
-      path: "datacenter/ucp/3.0"
+      path: "ee/ucp"
    values:
      ucp_org: "docker"
      ucp_repo: "ucp"
--- a/_config_authoring.yml
+++ b/_config_authoring.yml
@ -30,7 +30,7 @@ ucp_version: "3.0"

 ucp_versions:
  - version: "3.0"
-    path: /datacenter/ucp/3.0/guides/
+    path: /ee/ucp/
    latest: true
  - version: "2.2"
    path: /datacenter/ucp/2.2/guides/
@ -43,7 +43,7 @@ ucp_versions:

 dtr_versions:
  - version: "2.5"
-    path: /datacenter/dtr/2.5/guides/
+    path: /ee/dtr/
    latest: true
  - version: "2.4"
    path: /datacenter/dtr/2.4/guides/
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@ -185,7 +185,7 @@ guides:
        title: FAQ
  - sectiontitle: Release notes
    section:
-      - path: /enterprise/release-notes/
+      - path: /ee/17.06/
        title: Docker EE
        nosync: true
      - path: /release-notes/docker-ce/
@ -1373,7 +1373,7 @@ reference:
    - path: /reference/ucp/3.0/cli/uninstall-ucp/
      title: uninstall-ucp
    - path: /reference/ucp/3.0/cli/upgrade/
-      title: upgrade    
+      title: upgrade

 - sectiontitle: Application Programming Interfaces (APIs)
  section:
@ -1531,240 +1531,240 @@ samples:
 manuals:
 - sectiontitle: Docker Enterprise Edition
  section:
-  - path: /enterprise/
+  - path: /ee/
    title: About Docker EE
-  - path: /enterprise/supported-platforms/
+  - path: /ee/supported-platforms/
    title: Supported platforms
  - path: /engine/installation/
    title: Install Docker EE Engine
    nosync: true
  - title: Try Docker EE (no install)
    path: https://dockertrial.com
-  - path: /enterprise/telemetry/
+  - path: /ee/telemetry/
    title: Manage usage data collection
  - sectiontitle: Release notes
    section:
-    - path: /enterprise/17.03/release-notes/
+    - path: /ee/17.03/release-notes/
      title: "17.03"
-    - path: /enterprise/17.06/
+    - path: /ee/17.06/
      title: "17.06"
  - path: /datacenter/install/linux/
    title: Deploy Docker EE standard on Linux
-  - path: /enterprise/backup/
+  - path: /ee/backup/
    title: Backup Docker EE
-  - path: /enterprise/upgrade/
+  - path: /ee/upgrade/
    title: Upgrade Docker EE
-  - path: /enterprise/docker-ee-architecture/
+  - path: /ee/docker-ee-architecture/
    title: Docker EE Architecture
  - sectiontitle: Universal Control Plane
    section:
-    - path: /datacenter/ucp/3.0/guides/
+    - path: /ee/ucp/
      title: Universal Control Plane overview
-    - path: /datacenter/ucp/3.0/guides/ucp-architecture/
+    - path: /ee/ucp/ucp-architecture/
      title: UCP Architecture
    - sectiontitle: Administration
      section:
      - sectiontitle: Install
        section:
-        - path: /datacenter/ucp/3.0/guides/admin/install/system-requirements/
+        - path: /ee/ucp/admin/install/system-requirements/
          title: System requirements
-        - path: /datacenter/ucp/3.0/guides/admin/install/plan-installation/
+        - path: /ee/ucp/admin/install/plan-installation/
          title: Plan your installation
-        - path: /datacenter/ucp/3.0/guides/admin/install/
+        - path: /ee/ucp/admin/install/
          title: Install
-        - path: /datacenter/ucp/3.0/guides/admin/install/install-offline/
+        - path: /ee/ucp/admin/install/install-offline/
          title: Install offline
-        - path: /datacenter/ucp/3.0/guides/admin/install/upgrade/
+        - path: /ee/ucp/admin/install/upgrade/
          title: Upgrade
-        - path: /datacenter/ucp/3.0/guides/admin/install/upgrade-offline/
+        - path: /ee/ucp/admin/install/upgrade-offline/
          title: Upgrade offline
-        - path: /datacenter/ucp/3.0/guides/admin/install/uninstall/
+        - path: /ee/ucp/admin/install/uninstall/
          title: Uninstall
-        - path: /datacenter/ucp/3.0/guides/admin/install/architecture-specific-images/
+        - path: /ee/ucp/admin/install/architecture-specific-images/
          title: Architecture-specific images
      - sectiontitle: Configure
        section:
-        - path: /datacenter/ucp/3.0/guides/admin/configure/add-labels-to-cluster-nodes/
+        - path: /ee/ucp/admin/configure/add-labels-to-cluster-nodes/
          title: Add labels to cluster nodes
-        - path: /datacenter/ucp/3.0/guides/admin/configure/add-sans-to-cluster/
+        - path: /ee/ucp/admin/configure/add-sans-to-cluster/
          title: Add SANs to cluster certificates
-        - path: /datacenter/ucp/3.0/guides/admin/configure/integrate-with-dtr/
+        - path: /ee/ucp/admin/configure/integrate-with-dtr/
          title: Integrate with Docker Trusted Registry
-        - path: /datacenter/ucp/3.0/guides/admin/configure/external-auth/
+        - path: /ee/ucp/admin/configure/external-auth/
          title: Integrate with LDAP
-        - path: /datacenter/ucp/3.0/guides/admin/configure/external-auth/enable-ldap-config-file/
+        - path: /ee/ucp/admin/configure/external-auth/enable-ldap-config-file/
          title: Integrate with LDAP by using a configuration file
-        - path: /datacenter/ucp/3.0/guides/admin/configure/license-your-installation/
+        - path: /ee/ucp/admin/configure/license-your-installation/
          title: License your installation
-        - path: /datacenter/ucp/3.0/guides/admin/configure/restrict-services-to-worker-nodes/
+        - path: /ee/ucp/admin/configure/restrict-services-to-worker-nodes/
          title: Restrict services to worker nodes
-        - path: /datacenter/ucp/3.0/guides/admin/configure/run-only-the-images-you-trust/
+        - path: /ee/ucp/admin/configure/run-only-the-images-you-trust/
          title: Run only the images you trust
-        - path: /datacenter/ucp/3.0/guides/admin/configure/set-session-timeout/
+        - path: /ee/ucp/admin/configure/set-session-timeout/
          title: Set the user's session timeout
-        - path: /datacenter/ucp/3.0/guides/admin/configure/store-logs-in-an-external-system/
+        - path: /ee/ucp/admin/configure/store-logs-in-an-external-system/
          title: Store logs in an external system
-        - path: /datacenter/ucp/3.0/guides/admin/configure/ucp-configuration-file/
+        - path: /ee/ucp/admin/configure/ucp-configuration-file/
          title: UCP configuration file
-        - path: /datacenter/ucp/3.0/guides/admin/configure/use-node-local-network-in-swarm/
+        - path: /ee/ucp/admin/configure/use-node-local-network-in-swarm/
          title: Use a local node network in a swarm
-        - path: /datacenter/ucp/3.0/guides/admin/configure/use-your-own-tls-certificates/
+        - path: /ee/ucp/admin/configure/use-your-own-tls-certificates/
          title: Use your own TLS certificates
-        - path: /datacenter/ucp/3.0/guides/admin/configure/manage-and-deploy-private-images/
+        - path: /ee/ucp/admin/configure/manage-and-deploy-private-images/
          title: Manage and deploy private images
-        - path: /datacenter/ucp/3.0/guides/admin/configure/set-orchestrator-type/
+        - path: /ee/ucp/admin/configure/set-orchestrator-type/
          title: Set the orchestrator type for a node
-        - path: /datacenter/ucp/3.0/guides/admin/configure/view-namespace-resources/
+        - path: /ee/ucp/admin/configure/view-namespace-resources/
          title: View Kubernetes objects in a namespace
        - sectiontitle: Join nodes to your cluster
          section:
-          - path: /datacenter/ucp/3.0/guides/admin/configure/join-nodes/
+          - path: /ee/ucp/admin/configure/join-nodes/
            title: Set up high availability
-          - path: /datacenter/ucp/3.0/guides/admin/configure/join-nodes/join-linux-nodes-to-cluster/
+          - path: /ee/ucp/admin/configure/join-nodes/join-linux-nodes-to-cluster/
            title: Join nodes to your cluster
-          - path: /datacenter/ucp/3.0/guides/admin/configure/join-nodes/join-windows-nodes-to-cluster/
+          - path: /ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster/
            title: Join Windows worker nodes to your cluster
-          - path: /datacenter/ucp/3.0/guides/admin/configure/join-nodes/use-a-load-balancer/
+          - path: /ee/ucp/admin/configure/join-nodes/use-a-load-balancer/
            title: Use a load balancer
-        - path: /datacenter/ucp/3.0/guides/admin/configure/integrate-with-multiple-registries/
+        - path: /ee/ucp/admin/configure/integrate-with-multiple-registries/
          title: Integrate with multiple registries
      - sectiontitle: Monitor and troubleshoot
        section:
-        - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/
+        - path: /ee/ucp/admin/monitor-and-troubleshoot/
          title: Monitor the cluster status
-        - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/troubleshoot-node-messages/
+        - path: /ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-node-messages/
          title: Troubleshoot node messages
-        - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/troubleshoot-with-logs/
+        - path: /ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs/
          title: Troubleshoot with logs
-        - path: /datacenter/ucp/3.0/guides/admin/monitor-and-troubleshoot/troubleshoot-configurations/
+        - path: /ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations/
          title: Troubleshoot configurations
-      - path: /datacenter/ucp/3.0/guides/admin/backups-and-disaster-recovery/
+      - path: /ee/ucp/admin/backups-and-disaster-recovery/
        title: Backups and disaster recovery
      - title: CLI reference
        path: /reference/ucp/3.0/cli/
        nosync: true
    - sectiontitle: Authorize role-based access
      section:
-      - path: /datacenter/ucp/3.0/guides/authorization/
+      - path: /ee/ucp/authorization/
        title: Access control model overview
      - sectiontitle: The basics
        section:
-        - path: /datacenter/ucp/3.0/guides/authorization/create-users-and-teams-manually/
+        - path: /ee/ucp/authorization/create-users-and-teams-manually/
          title: Create users and teams manually
-        - path: /datacenter/ucp/3.0/guides/authorization/create-teams-with-ldap/
+        - path: /ee/ucp/authorization/create-teams-with-ldap/
          title: Create teams with LDAP
-        - path: /datacenter/ucp/3.0/guides/authorization/define-roles/
+        - path: /ee/ucp/authorization/define-roles/
          title: Define roles with authorized API operations
-        - path: /datacenter/ucp/3.0/guides/authorization/group-resources/
+        - path: /ee/ucp/authorization/group-resources/
          title: Group and isolate cluster resources
-        - path: /datacenter/ucp/3.0/guides/authorization/grant-permissions/
+        - path: /ee/ucp/authorization/grant-permissions/
          title: Grant role-access to cluster resources
-        - path: /datacenter/ucp/3.0/guides/authorization/reset-user-password/
+        - path: /ee/ucp/authorization/reset-user-password/
          title: Reset user passwords
      - sectiontitle: Tutorials and use cases
        section:
-        - path: /datacenter/ucp/3.0/guides/authorization/deploy-stateless-app/
+        - path: /ee/ucp/authorization/deploy-stateless-app/
          title: Deploy stateless app with RBAC
-        - path: /datacenter/ucp/3.0/guides/authorization/isolate-volumes/
+        - path: /ee/ucp/authorization/isolate-volumes/
          title: Isolate volumes
-        - path: /datacenter/ucp/3.0/guides/authorization/isolate-nodes/
+        - path: /ee/ucp/authorization/isolate-nodes/
          title: Isolate nodes
-        - path: /datacenter/ucp/3.0/guides/authorization/ee-standard/
+        - path: /ee/ucp/authorization/ee-standard/
          title: Docker EE Standard use case
-        - path: /datacenter/ucp/3.0/guides/authorization/ee-advanced/
+        - path: /ee/ucp/authorization/ee-advanced/
          title: Docker EE Advanced use case
    - sectiontitle: User guides
      section:
      - sectiontitle: Access UCP
        section:
-        - path: /datacenter/ucp/3.0/guides/user/access-ucp/
+        - path: /ee/ucp/user/access-ucp/
          title: Web-based access
-        - path: /datacenter/ucp/3.0/guides/user/access-ucp/cli-based-access/
+        - path: /ee/ucp/user/access-ucp/cli-based-access/
          title: CLI-based access
      - sectiontitle: Deploy an application
        section:
-        - path: /datacenter/ucp/3.0/guides/user/services/deploy-a-service/
+        - path: /ee/ucp/user/services/deploy-a-service/
          title: Deploy a service
-        - path: /datacenter/ucp/3.0/guides/user/services/
+        - path: /ee/ucp/user/services/
          title: Deploy an app from the UI
-        - path: /datacenter/ucp/3.0/guides/user/services/deploy-app-cli/
+        - path: /ee/ucp/user/services/deploy-app-cli/
          title: Deploy an app from the CLI
-        - path: /datacenter/ucp/3.0/guides/user/services/deploy-stack-to-collection/
+        - path: /ee/ucp/user/services/deploy-stack-to-collection/
          title: Deploy application resources to a collection
-        - path: /datacenter/ucp/3.0/guides/user/services/deploy-kubernetes-workload/
+        - path: /ee/ucp/user/services/deploy-kubernetes-workload/
          title: Deploy a workload to a Kubernetes cluster
-        - path: /datacenter/ucp/3.0/guides/user/services/deploy-compose-on-kubernetes/
+        - path: /ee/ucp/user/services/deploy-compose-on-kubernetes/
          title: Deploy a Compose-based app to a Kubernetes cluster
      - sectiontitle: Secrets
        section:
-        - path: /datacenter/ucp/3.0/guides/user/secrets/
+        - path: /ee/ucp/user/secrets/
          title: Manage secrets
-        - path: /datacenter/ucp/3.0/guides/user/secrets/grant-revoke-access/
+        - path: /ee/ucp/user/secrets/grant-revoke-access/
          title: Grant access to secrets
    - sectiontitle: Layer 7 routing
      section:
      - title: Layer 7 routing overview
-        path: /datacenter/ucp/3.0/guides/interlock/
+        path: /ee/ucp/interlock/
      - sectiontitle: Introduction
        section:
        - title: What is Layer 7 routing
-          path: /datacenter/ucp/3.0/guides/interlock/intro/
+          path: /ee/ucp/interlock/intro/
        - title: Architecture
-          path: /datacenter/ucp/3.0/guides/interlock/intro/architecture/
+          path: /ee/ucp/interlock/intro/architecture/
      - sectiontitle: Deployment
        section:
        - title: Get started
-          path: /datacenter/ucp/3.0/guides/interlock/install/
+          path: /ee/ucp/interlock/install/
        - title: Manual deployment
-          path: /datacenter/ucp/3.0/guides/interlock/install/manual-deployment/
+          path: /ee/ucp/interlock/install/manual-deployment/
        - title: Production
-          path: /datacenter/ucp/3.0/guides/interlock/install/production/
+          path: /ee/ucp/interlock/install/production/
        - title: Offline install
-          path: /datacenter/ucp/3.0/guides/interlock/install/offline/
+          path: /ee/ucp/interlock/install/offline/
      - sectiontitle: Configuration
        section:
        - title: Layer 7 routing
-          path: /datacenter/ucp/3.0/guides/interlock/configuration/
+          path: /ee/ucp/interlock/configuration/
        - title: Service labels
-          path: /datacenter/ucp/3.0/guides/interlock/configuration/service-labels/
+          path: /ee/ucp/interlock/configuration/service-labels/
      - sectiontitle: Extensions
        section:
        - title: Nginx
-          path: /datacenter/ucp/3.0/guides/interlock/extensions/nginx/
+          path: /ee/ucp/interlock/extensions/nginx/
        - title: HAProxy
-          path: /datacenter/ucp/3.0/guides/interlock/extensions/haproxy/
+          path: /ee/ucp/interlock/extensions/haproxy/
      - sectiontitle: Deploy apps with Layer 7 routing
        section:
        - title: Basic deployment
-          path: /datacenter/ucp/3.0/guides/interlock/usage/
+          path: /ee/ucp/interlock/usage/
        - title: Applications with SSL
-          path: /datacenter/ucp/3.0/guides/interlock/usage/ssl/
+          path: /ee/ucp/interlock/usage/ssl/
        - title: Application redirects
-          path: /datacenter/ucp/3.0/guides/interlock/usage/redirects/
+          path: /ee/ucp/interlock/usage/redirects/
        - title: Persistent (sticky) sessions
-          path: /datacenter/ucp/3.0/guides/interlock/usage/sessions/
+          path: /ee/ucp/interlock/usage/sessions/
        - title: Websockets
-          path: /datacenter/ucp/3.0/guides/interlock/usage/websockets/
+          path: /ee/ucp/interlock/usage/websockets/
        - title: Canary application instances
-          path: /datacenter/ucp/3.0/guides/interlock/usage/canary/
+          path: /ee/ucp/interlock/usage/canary/
        - title: Service clusters
-          path: /datacenter/ucp/3.0/guides/interlock/usage/service-clusters/
+          path: /ee/ucp/interlock/usage/service-clusters/
        - title: Context/Path based routing
-          path: /datacenter/ucp/3.0/guides/interlock/usage/context/
+          path: /ee/ucp/interlock/usage/context/
        - title: Host mode networking
-          path: /datacenter/ucp/3.0/guides/interlock/usage/host-mode-networking/
+          path: /ee/ucp/interlock/usage/host-mode-networking/
      - sectiontitle: Operations
        section:
        - title: Updates
-          path: /datacenter/ucp/3.0/guides/interlock/ops/
+          path: /ee/ucp/interlock/ops/
        - title: Tuning
-          path: /datacenter/ucp/3.0/guides/interlock/ops/tuning/
+          path: /ee/ucp/interlock/ops/tuning/
    - title: API reference
      path: /reference/ucp/3.0/api/
      nosync: true
-    - path: /datacenter/ucp/3.0/guides/release-notes/
+    - path: /ee/ucp/release-notes/
      title: Release notes
-    - path: /datacenter/ucp/3.0/guides/get-support/
+    - path: /ee/ucp/get-support/
      title: Get support
    - sectiontitle: Previous versions
      section:
@ -2298,94 +2298,94 @@ manuals:
          title: Release notes
  - sectiontitle: Docker Trusted Registry
    section:
-    - path: /datacenter/dtr/2.5/guides/
+    - path: /ee/dtr/
      title: Docker Trusted Registry overview
-    - path: /datacenter/dtr/2.5/guides/architecture/
+    - path: /ee/dtr/architecture/
      title: Architecture
    - sectiontitle: Administration
      section:
      - sectiontitle: Install
        section:
-        - path: /datacenter/dtr/2.5/guides/admin/install/system-requirements/
+        - path: /ee/dtr/admin/install/system-requirements/
          title: System requirements
-        - path: /datacenter/dtr/2.5/guides/admin/install/
+        - path: /ee/dtr/admin/install/
          title: Install
-        - path: /datacenter/dtr/2.5/guides/admin/install/install-offline/
+        - path: /ee/dtr/admin/install/install-offline/
          title: Install offline
-        - path: /datacenter/dtr/2.5/guides/admin/upgrade/
+        - path: /ee/dtr/admin/upgrade/
          title: Upgrade
-        - path: /datacenter/dtr/2.5/guides/admin/install/uninstall/
+        - path: /ee/dtr/admin/install/uninstall/
          title: Uninstall
      - sectiontitle: Configure
        section:
-        - path: /datacenter/dtr/2.5/guides/admin/configure/license-your-installation/
+        - path: /ee/dtr/admin/configure/license-your-installation/
          title: License your installation
-        - path: /datacenter/dtr/2.5/guides/admin/configure/use-your-own-tls-certificates/
+        - path: /ee/dtr/admin/configure/use-your-own-tls-certificates/
          title: Use your own TLS certificates
-        - path: /datacenter/dtr/2.5/guides/admin/configure/enable-single-sign-on/
+        - path: /ee/dtr/admin/configure/enable-single-sign-on/
          title: Enable single sign-on
        - sectiontitle: External storage
          section:
-          - path: /datacenter/dtr/2.5/guides/admin/configure/external-storage/
+          - path: /ee/dtr/admin/configure/external-storage/
            title: Overview
-          - path: /datacenter/dtr/2.5/guides/admin/configure/external-storage/s3/
+          - path: /ee/dtr/admin/configure/external-storage/s3/
            title: S3
-          - path: /datacenter/dtr/2.5/guides/admin/configure/external-storage/nfs/
+          - path: /ee/dtr/admin/configure/external-storage/nfs/
            title: NFS
-        - path: /datacenter/dtr/2.5/guides/admin/configure/set-up-high-availability/
+        - path: /ee/dtr/admin/configure/set-up-high-availability/
          title: Set up high availability
-        - path: /datacenter/dtr/2.5/guides/admin/configure/use-a-load-balancer/
+        - path: /ee/dtr/admin/configure/use-a-load-balancer/
          title: Use a load balancer
-        - path: /datacenter/dtr/2.5/guides/admin/configure/set-up-vulnerability-scans/
+        - path: /ee/dtr/admin/configure/set-up-vulnerability-scans/
          title: Set up vulnerability scans
        - sectiontitle: Deploy caches
          section:
-          - path: /datacenter/dtr/2.5/guides/admin/configure/deploy-caches/
+          - path: /ee/dtr/admin/configure/deploy-caches/
            title: Overview
-          - path: /datacenter/dtr/2.5/guides/admin/configure/deploy-caches/tls/
+          - path: /ee/dtr/admin/configure/deploy-caches/tls/
            title: Deploy caches with TLS
-          - path: /datacenter/dtr/2.5/guides/admin/configure/deploy-caches/chaining/
+          - path: /ee/dtr/admin/configure/deploy-caches/chaining/
            title: Chain multiple caches
-        - path: /datacenter/dtr/2.5/guides/admin/configure/garbage-collection/
+        - path: /ee/dtr/admin/configure/garbage-collection/
          title: Garbage collection
        - title: Allow users to create repositories when pushing
-          path: /datacenter/dtr/2.5/guides/admin/configure/allow-creation-on-push/
-        - path: /datacenter/dtr/2.5/guides/admin/configure/use-a-web-proxy/
+          path: /ee/dtr/admin/configure/allow-creation-on-push/
+        - path: /ee/dtr/admin/configure/use-a-web-proxy/
          title: Use a web proxy
      - sectiontitle: Manage users
        section:
-        - path: /datacenter/dtr/2.5/guides/admin/manage-users/
+        - path: /ee/dtr/admin/manage-users/
          title: Authentication and authorization
-        - path: /datacenter/dtr/2.5/guides/admin/manage-users/create-and-manage-users/
+        - path: /ee/dtr/admin/manage-users/create-and-manage-users/
          title: Create and manage users
-        - path: /datacenter/dtr/2.5/guides/admin/manage-users/create-and-manage-teams/
+        - path: /ee/dtr/admin/manage-users/create-and-manage-teams/
          title: Create and manage teams
-        - path: /datacenter/dtr/2.5/guides/admin/manage-users/create-and-manage-orgs/
+        - path: /ee/dtr/admin/manage-users/create-and-manage-orgs/
          title: Create and manage organizations
-        - path: /datacenter/dtr/2.5/guides/admin/manage-users/permission-levels/
+        - path: /ee/dtr/admin/manage-users/permission-levels/
          title: Permission levels
      - sectiontitle: Monitor and troubleshoot
        section:
-        - path: /datacenter/dtr/2.5/guides/admin/monitor-and-troubleshoot/
+        - path: /ee/dtr/admin/monitor-and-troubleshoot/
          title: Monitor the cluster status
-        - path: /datacenter/dtr/2.5/guides/admin/monitor-and-troubleshoot/notary-audit-logs/
+        - path: /ee/dtr/admin/monitor-and-troubleshoot/notary-audit-logs/
          title: Check Notary audit logs
-        - path: /datacenter/dtr/2.5/guides/admin/monitor-and-troubleshoot/troubleshoot-with-logs/
+        - path: /ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-with-logs/
          title: Troubleshoot with logs
-        - path: /datacenter/dtr/2.5/guides/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs/
+        - path: /ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs/
          title: Troubleshoot batch jobs
      - sectiontitle: Disaster recovery
        section:
        - title: Overview
-          path: /datacenter/dtr/2.5/guides/admin/disaster-recovery/
+          path: /ee/dtr/admin/disaster-recovery/
        - title: Repair a single replica
-          path: /datacenter/dtr/2.5/guides/admin/disaster-recovery/repair-a-single-replica/
+          path: /ee/dtr/admin/disaster-recovery/repair-a-single-replica/
        - title: Repair a cluster
-          path: /datacenter/dtr/2.5/guides/admin/disaster-recovery/repair-a-cluster/
+          path: /ee/dtr/admin/disaster-recovery/repair-a-cluster/
        - title: Create a backup
-          path: /datacenter/dtr/2.5/guides/admin/disaster-recovery/create-a-backup/
+          path: /ee/dtr/admin/disaster-recovery/create-a-backup/
        - title: Restore from a backup
-          path: /datacenter/dtr/2.5/guides/admin/disaster-recovery/restore-from-backup/
+          path: /ee/dtr/admin/disaster-recovery/restore-from-backup/
      - title: CLI reference
        path: /reference/dtr/2.5/cli/
        nosync: true
@ -2393,54 +2393,54 @@ manuals:
      section:
      - sectiontitle: Access DTR
        section:
-        - path: /datacenter/dtr/2.5/guides/user/access-dtr/
+        - path: /ee/dtr/user/access-dtr/
          title: Configure your Docker daemon
-        - path: /datacenter/dtr/2.5/guides/user/access-dtr/configure-your-notary-client/
+        - path: /ee/dtr/user/access-dtr/configure-your-notary-client/
          title: Configure your Notary client
-        - path: /datacenter/dtr/2.5/guides/user/access-dtr/use-a-cache/
+        - path: /ee/dtr/user/access-dtr/use-a-cache/
          title: Use a cache
      - sectiontitle: Manage images
        section:
-        - path: /datacenter/dtr/2.5/guides/user/manage-images/
+        - path: /ee/dtr/user/manage-images/
          title: Create a repository
-        - path: /datacenter/dtr/2.5/guides/user/manage-images/pull-and-push-images/
+        - path: /ee/dtr/user/manage-images/pull-and-push-images/
          title: Pull and push images
-        - path: /datacenter/dtr/2.5/guides/user/manage-images/delete-images/
+        - path: /ee/dtr/user/manage-images/delete-images/
          title: Delete images
-        - path: /datacenter/dtr/2.5/guides/user/manage-images/scan-images-for-vulnerabilities/
+        - path: /ee/dtr/user/manage-images/scan-images-for-vulnerabilities/
          title: Scan images for vulnerabilities
-        - path: /datacenter/dtr/2.5/guides/user/manage-images/prevent-tags-from-being-overwritten/
+        - path: /ee/dtr/user/manage-images/prevent-tags-from-being-overwritten/
          title: Prevent tags from being overwritten
        - sectiontitle: Sign images
          section:
-          - path: /datacenter/dtr/2.5/guides/user/manage-images/sign-images/
+          - path: /ee/dtr/user/manage-images/sign-images/
            title: Sign an image
-          - path: /datacenter/dtr/2.5/guides/user/manage-images/sign-images/delegate-image-signing/
+          - path: /ee/dtr/user/manage-images/sign-images/delegate-image-signing/
            title: Delegate image signing
-          - path: /datacenter/dtr/2.5/guides/user/manage-images/sign-images/manage-trusted-repositories/
+          - path: /ee/dtr/user/manage-images/sign-images/manage-trusted-repositories/
            title: Manage trusted repositories
      - sectiontitle: Promotion policies and mirroring
        section:
          - title: Overview
-            path: /datacenter/dtr/2.5/guides/user/promotion-policies/
+            path: /ee/dtr/user/promotion-policies/
          - title: Promote an image using policies
-            path: /datacenter/dtr/2.5/guides/user/promotion-policies/internal-promotion/
+            path: /ee/dtr/user/promotion-policies/internal-promotion/
          - title: Mirror images to another registry
-            path: /datacenter/dtr/2.5/guides/user/promotion-policies/push-mirror/
+            path: /ee/dtr/user/promotion-policies/push-mirror/
          - title: Mirror images from another registry
-            path: /datacenter/dtr/2.5/guides/user/promotion-policies/pull-mirror/
+            path: /ee/dtr/user/promotion-policies/pull-mirror/
          - title: Template reference
-            path: /datacenter/dtr/2.5/guides/user/promotion-policies/templates/
-      - path: /datacenter/dtr/2.5/guides/user/create-and-manage-webhooks/
+            path: /ee/dtr/user/promotion-policies/templates/
+      - path: /ee/dtr/user/create-and-manage-webhooks/
        title: Create and manage webhooks
      - title: Manage access tokens
-        path: /datacenter/dtr/2.5/guides/user/access-tokens/
+        path: /ee/dtr/user/access-tokens/
    - title: API reference
      path: /reference/dtr/2.5/api/
      nosync: true
-    - path: /datacenter/dtr/2.5/guides/release-notes/
+    - path: /ee/dtr/release-notes/
      title: Release notes
-    - path: /datacenter/dtr/2.5/guides/support/
+    - path: /ee/dtr/support/
      title: Get support
    - sectiontitle: Previous versions
      section:
@ -3633,7 +3633,7 @@ manuals:
  section:
    - path: /release-notes/
      title: Overview
-    - path: /enterprise/17.06/
+    - path: /ee/17.06/
      title: Docker EE
      nosync: true
    - path: /release-notes/docker-ce/
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@ -137,7 +137,7 @@
 								{% capture enterprise_advisory %}<blockquote>
 								<p>These instructions require Docker Enterprise</p>
 								<p>The UI instructions shown here are for the dashboard provided with
-								<a href="/enterprise/#docker-ee-feature-tiers">Docker Enterprise Standard</a>
+								<a href="/ee/">Docker Enterprise Standard</a>
 								or higher.</p></blockquote>
 								{% if page.whole_page_ee %}{{ enterprise_advisory }}{% endif %}{% endcapture %}
 								{% if page.intro %}{{ page.intro | markdownify }}{% else %}{{ page.description | markdownify }}{% endif %}
--- a/datacenter/dtr/2.5/guides/images/Makefile
+++ b/datacenter/dtr/2.5/guides/images/Makefile
@ -1,47 +0,0 @@
-
-SIZE="1280px"
-HOST=dtr.domain.com
-HOSTIP:=192.168.18.131
-HOSTURL=https://$(HOST)
-IMAGE=svendowideit/screenshot
-#IMAGE=screenshot
-RUNOPTS=docker run --rm -v $(CURDIR):/srv --add-host $(HOST):$(HOSTIP)
-RUN=$(RUNOPTS) $(IMAGE)
-
-all:
-	# Needs to be run with no authentication
-	$(RUN) $(HOSTURL)/admin/ admin-metrics.png $(SIZE)
-	$(RUN) $(HOSTURL)/admin/logs/ admin-logs.png $(SIZE)
-	$(RUN) $(HOSTURL)/admin/settings/auth/ admin-settings-authentication.png $(SIZE)
-	$(RUN) $(HOSTURL)/admin/settings/general admin-settings.png $(SIZE)
-	$(RUN) $(HOSTURL)/admin/settings/security admin-settings-security.png $(SIZE)
-	$(RUN) $(HOSTURL)/admin/settings/storage admin-settings-storage.png $(SIZE)
-	$(RUN) $(HOSTURL)/admin/settings/license admin-settings-license.png $(SIZE)
-
-manual:
-	#  --env-file=passwords.env
-	$(RUNOPTS)  --env-file=passwords.env \
-		$(IMAGE) \
-		$(HOSTURL)/admin/settings#auth admin-settings-authentication-basic.png $(SIZE)
-
-	#admin-settings-authentication-ldap.png
-
-
-# TODO: needs manual intervention atm
-qs1:
-	# this requires the hostname to resolve.
-	echo "$HOST $HOSTIP" >> /etc/hosts
-	# and requires that host to be added to the docker daemon's insecure registry settings
-	# maybe use a dind daemon?
-	
-	docker pull jenkins
-	docker tag -f jenkins t400s.home.org.au/ci-infrastructure/jnkns-img
-	docker push t400s.home.org.au/ci-infrastructure/jnkns-img
-	sleep 1
-	$(RUN) $(HOSTURL)/admin/ console-push.png $(SIZE)
-	sleep 10
-qs2:
-	docker rmi jenkins t400s.home.org.au/ci-infrastructure/jnkns-img
-	docker pull t400s.home.org.au/ci-infrastructure/jnkns-img
-	sleep 1
-	$(RUN) $(HOSTURL)/admin/ console-pull.png $(SIZE)
--- a/datacenter/dtr/2.5/guides/images/admin-settings-auth.png
+++ b/datacenter/dtr/2.5/guides/images/admin-settings-auth.png
--- a/datacenter/dtr/2.5/guides/images/admin-settings-license2.png
+++ b/datacenter/dtr/2.5/guides/images/admin-settings-license2.png
--- a/datacenter/dtr/2.5/guides/images/admin-settings-storage-azure.png
+++ b/datacenter/dtr/2.5/guides/images/admin-settings-storage-azure.png
--- a/datacenter/dtr/2.5/guides/images/admin-settings-storage-s3.png
+++ b/datacenter/dtr/2.5/guides/images/admin-settings-storage-s3.png
--- a/datacenter/dtr/2.5/guides/images/aws-dtr-sg-rules.png
+++ b/datacenter/dtr/2.5/guides/images/aws-dtr-sg-rules.png
--- a/datacenter/dtr/2.5/guides/images/aws-instance-id.png
+++ b/datacenter/dtr/2.5/guides/images/aws-instance-id.png
--- a/datacenter/dtr/2.5/guides/images/azure_filter.png
+++ b/datacenter/dtr/2.5/guides/images/azure_filter.png
--- a/datacenter/dtr/2.5/guides/images/azure_ip.png
+++ b/datacenter/dtr/2.5/guides/images/azure_ip.png
--- a/datacenter/dtr/2.5/guides/images/azure_portal.png
+++ b/datacenter/dtr/2.5/guides/images/azure_portal.png
--- a/datacenter/dtr/2.5/guides/images/basic_configuration.png
+++ b/datacenter/dtr/2.5/guides/images/basic_configuration.png
--- a/datacenter/dtr/2.5/guides/images/dashboard-settings-general.png
+++ b/datacenter/dtr/2.5/guides/images/dashboard-settings-general.png
--- a/datacenter/dtr/2.5/guides/images/docker-hub-org-enterprise-license-CSDE-dropdown.png
+++ b/datacenter/dtr/2.5/guides/images/docker-hub-org-enterprise-license-CSDE-dropdown.png
--- a/datacenter/dtr/2.5/guides/images/docker-hub-org-enterprise-license.png
+++ b/datacenter/dtr/2.5/guides/images/docker-hub-org-enterprise-license.png
--- a/datacenter/dtr/2.5/guides/images/dtr-integration-1.png
+++ b/datacenter/dtr/2.5/guides/images/dtr-integration-1.png
--- a/datacenter/dtr/2.5/guides/images/dtr-license-download.png
+++ b/datacenter/dtr/2.5/guides/images/dtr-license-download.png
--- a/datacenter/dtr/2.5/guides/images/jenkins-plugins.png
+++ b/datacenter/dtr/2.5/guides/images/jenkins-plugins.png
--- a/datacenter/dtr/2.5/guides/images/jenkins-ui.png
+++ b/datacenter/dtr/2.5/guides/images/jenkins-ui.png
--- a/datacenter/dtr/2.5/guides/images/overview-1.png
+++ b/datacenter/dtr/2.5/guides/images/overview-1.png
--- a/datacenter/dtr/2.5/guides/images/overview-2.png
+++ b/datacenter/dtr/2.5/guides/images/overview-2.png
--- a/datacenter/dtr/2.5/guides/images/release-notes-1.png
+++ b/datacenter/dtr/2.5/guides/images/release-notes-1.png
--- a/datacenter/dtr/2.5/guides/images/repair-single-replica-1.svg
+++ b/datacenter/dtr/2.5/guides/images/repair-single-replica-1.svg
@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background: #FFFFFF;">
-    <!-- Generator: Sketch 48.1 (47250) - http://www.bohemiancoding.com/sketch -->
-    <title>repair-single-replica-1</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <circle id="path-2" cx="4" cy="4" r="4"></circle>
-        <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <circle id="path-4" cx="4" cy="4" r="4"></circle>
-        <circle id="path-5" cx="4" cy="4" r="4"></circle>
-    </defs>
-    <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repair-single-replica-1">
-            <g id="group" transform="translate(29.000000, 55.000000)">
-                <g id="dtr">
-                    <g id="network" transform="translate(0.000000, 117.000000)">
-                        <rect id="Rectangle-138" fill="#439FD1" x="0" y="10" width="682" height="14" rx="2"></rect>
-                        <polygon id="crash" fill="#EF4A53" transform="translate(344.069990, 16.875446) rotate(45.000000) translate(-344.069990, -16.875446) " points="328.552223 9.11656294 359.587757 9.11656294 348.024545 18.9488562 359.587757 24.6343299 328.552223 24.6343299 342.486438 15.2918947"></polygon>
-                    </g>
-                    <g id="arrows" transform="translate(229.000000, 102.000000)"></g>
-                    <g id="nodes">
-                        <g id="node-1-copy-4" transform="translate(476.000000, 0.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1-copy-3" transform="translate(367.000000, 0.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-2"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1-copy-2" transform="translate(218.000000, 0.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1-copy" transform="translate(109.000000, 0.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-4"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/datacenter/dtr/2.5/guides/images/repair-single-replica-2.svg
+++ b/datacenter/dtr/2.5/guides/images/repair-single-replica-2.svg
@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background: #FFFFFF;">
-    <!-- Generator: Sketch 48.1 (47250) - http://www.bohemiancoding.com/sketch -->
-    <title>repair-single-replica-2</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <circle id="path-2" cx="4" cy="4" r="4"></circle>
-        <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <circle id="path-4" cx="4" cy="4" r="4"></circle>
-        <circle id="path-5" cx="4" cy="4" r="4"></circle>
-        <circle id="path-6" cx="4" cy="4" r="4"></circle>
-    </defs>
-    <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="repair-single-replica-2">
-            <g id="group" transform="translate(29.000000, 38.000000)">
-                <g id="dtr">
-                    <g id="network" transform="translate(0.000000, 134.000000)">
-                        <rect id="Rectangle-138" fill="#439FD1" x="0" y="10" width="682" height="14" rx="2"></rect>
-                        <polygon id="crash" fill="#EF4A53" transform="translate(344.069990, 16.875446) rotate(45.000000) translate(-344.069990, -16.875446) " points="328.552223 9.11656294 359.587757 9.11656294 348.024545 18.9488562 359.587757 24.6343299 328.552223 24.6343299 342.486438 15.2918947"></polygon>
-                    </g>
-                    <g id="arrows" transform="translate(229.000000, 119.000000)"></g>
-                    <g id="nodes">
-                        <g id="node-1-copy-5" transform="translate(585.000000, 0.000000)">
-                            <g id="arrow" transform="translate(48.500000, 136.000000) rotate(-90.000000) translate(-48.500000, -136.000000) translate(32.000000, 132.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#E0E4E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#E0E4E7" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(20.000000, 17.000000)"></g>
-                            <rect id="node-border" fill="#E0E4E7" x="0" y="17" width="97" height="102" rx="2"></rect>
-                            <text id="+" font-family="OpenSans, Open Sans" font-size="100" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="20.4111328" y="107">+</tspan>
-                            </text>
-                        </g>
-                        <g id="node-1-copy-4" transform="translate(476.000000, 17.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-2"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1-copy-3" transform="translate(367.000000, 17.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1-copy-2" transform="translate(218.000000, 17.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-4"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1-copy" transform="translate(109.000000, 17.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                        <g id="node-1" transform="translate(0.000000, 17.000000)">
-                            <g id="arrow" transform="translate(48.500000, 119.000000) rotate(-90.000000) translate(-48.500000, -119.000000) translate(32.000000, 115.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#439FD1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                                <g id="Oval">
-                                    <use fill="#439FD1" fill-rule="evenodd" xlink:href="#path-6"></use>
-                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
-                                </g>
-                            </g>
-                            <g id="node">
-                                <g id="node-label">
-                                    <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
-                                    <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="6" y="14">worker node</tspan>
-                                    </text>
-                                </g>
-                            </g>
-                            <g id="engine" transform="translate(1.000000, 43.000000)">
-                                <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="58" rx="2"></rect>
-                                <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="38.4980469" y="33">DTR</tspan>
-                                </text>
-                            </g>
-                            <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/datacenter/dtr/2.5/guides/images/repo.png
+++ b/datacenter/dtr/2.5/guides/images/repo.png
--- a/datacenter/dtr/2.5/guides/images/script-copy.png
+++ b/datacenter/dtr/2.5/guides/images/script-copy.png
--- a/datacenter/ucp/2.1/guides/architecture.md
+++ b/datacenter/ucp/2.1/guides/architecture.md
@ -4,7 +4,7 @@ keywords: docker, ucp, architecture
 title: UCP architecture
 ---

-Universal Control Plane is a containerized application that runs on [Docker Enterprise Edition](/enterprise/index.md) and extends its functionality to
+Universal Control Plane is a containerized application that runs on [Docker Enterprise Edition](/ee/index.md) and extends its functionality to
 make it easier to deploy, configure, and monitor your applications at scale.

 It also secures Docker with role-based access control so that only authorized
@ -57,20 +57,20 @@ on a node depend on whether that node is a manager or a worker.
 Manager nodes run all UCP services, including the web UI and data stores that
 persist the state of UCP. These are the UCP services running on manager nodes:

-| UCP component       | Description                                                                                                                                                                                       |
-|:--------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| ucp-agent           | Monitors the node and ensures the right UCP services are running                                                                                                                                  |
-| ucp-reconcile       | When ucp-agent detects that the node is not running the right UCP components, it starts the ucp-reconcile container to converge the node to its desired state. It is expected for the ucp-reconcile container to remain in an exited state when the node is healthy. 							  |
-| ucp-auth-api        | The centralized service for identity and authentication used by UCP and DTR                                                                                                                       |
-| ucp-auth-store      | Stores authentication configurations, and data for users, organizations and teams                                                                                                                 |
-| ucp-auth-worker     | Performs scheduled LDAP synchronizations and cleans authentication and authorization data                                                                                                         |
-| ucp-client-root-ca  | A certificate authority to sign client bundles                                                                                                                                                    |
-| ucp-cluster-root-ca | A certificate authority used for TLS communication between UCP components                                                                                                                         |
-| ucp-controller      | The UCP web server                                                                                                                                                                                |
-| ucp-kv              | Used to store the UCP configurations. Don't use it in your applications, since it's for internal use only                                                                                         |
-| ucp-metrics         | Used to collect and process metrics for a node, like the disk space available                                                                                                                     |
-| ucp-proxy           | A TLS proxy. It allows secure access to the local Docker Engine to UCP components                                                                                                                 |
-| ucp-swarm-manager   | Used to provide backwards-compatibility with Docker Swarm                                                                                                                                         |
+| UCP component       | Description                                                                                                                                                                                                                                                          |
+|:--------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ucp-agent           | Monitors the node and ensures the right UCP services are running                                                                                                                                                                                                     |
+| ucp-reconcile       | When ucp-agent detects that the node is not running the right UCP components, it starts the ucp-reconcile container to converge the node to its desired state. It is expected for the ucp-reconcile container to remain in an exited state when the node is healthy. |
+| ucp-auth-api        | The centralized service for identity and authentication used by UCP and DTR                                                                                                                                                                                          |
+| ucp-auth-store      | Stores authentication configurations, and data for users, organizations and teams                                                                                                                                                                                    |
+| ucp-auth-worker     | Performs scheduled LDAP synchronizations and cleans authentication and authorization data                                                                                                                                                                            |
+| ucp-client-root-ca  | A certificate authority to sign client bundles                                                                                                                                                                                                                       |
+| ucp-cluster-root-ca | A certificate authority used for TLS communication between UCP components                                                                                                                                                                                            |
+| ucp-controller      | The UCP web server                                                                                                                                                                                                                                                   |
+| ucp-kv              | Used to store the UCP configurations. Don't use it in your applications, since it's for internal use only                                                                                                                                                            |
+| ucp-metrics         | Used to collect and process metrics for a node, like the disk space available                                                                                                                                                                                        |
+| ucp-proxy           | A TLS proxy. It allows secure access to the local Docker Engine to UCP components                                                                                                                                                                                    |
+| ucp-swarm-manager   | Used to provide backwards-compatibility with Docker Swarm                                                                                                                                                                                                            |



@ -80,11 +80,11 @@ persist the state of UCP. These are the UCP services running on manager nodes:
 Worker nodes are the ones where you run your applications. These are the UCP
 services running on worker nodes:

-| UCP component | Description                                                                                                                                                                                       |
-|:--------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| ucp-agent     | Monitors the node and ensures the right UCP services are running                                                                                                                                  |
-| ucp-reconcile | When ucp-agent detects that the node is not running the right UCP components, it starts the ucp-reconcile container to converge the node to its desired state. It is expected for the ucp-reconcile container to remain in an exited state when the node is healthy. 							                  |
-| ucp-proxy     | A TLS proxy. It allows secure access to the local Docker Engine to UCP components                                                                                                                 |
+| UCP component | Description                                                                                                                                                                                                                                                          |
+|:--------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ucp-agent     | Monitors the node and ensures the right UCP services are running                                                                                                                                                                                                     |
+| ucp-reconcile | When ucp-agent detects that the node is not running the right UCP components, it starts the ucp-reconcile container to converge the node to its desired state. It is expected for the ucp-reconcile container to remain in an exited state when the node is healthy. |
+| ucp-proxy     | A TLS proxy. It allows secure access to the local Docker Engine to UCP components                                                                                                                                                                                    |

 ## Volumes used by UCP

--- a/datacenter/ucp/2.2/guides/architecture.md
+++ b/datacenter/ucp/2.2/guides/architecture.md
@ -5,7 +5,7 @@ keywords: ucp, architecture
 ---

 Universal Control Plane is a containerized application that runs on
-[Docker Enterprise Edition](/enterprise/index.md) and extends its functionality
+[Docker Enterprise Edition](/ee/index.md) and extends its functionality
 to make it easier to deploy, configure, and monitor your applications at scale.

 UCP also secures Docker with role-based access control so that only authorized
@ -71,8 +71,8 @@ on a node depend on whether the node is a manager or a worker.
 Manager nodes run all UCP services, including the web UI and data stores that
 persist the state of UCP. These are the UCP services running on manager nodes:

-|    UCP component    |                                                                                                                             Description                                                                                                                              |
-| :------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| UCP component       | Description                                                                                                                                                                                                                                                          |
+|:--------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | ucp-agent           | Monitors the node and ensures the right UCP services are running                                                                                                                                                                                                     |
 | ucp-reconcile       | When ucp-agent detects that the node is not running the right UCP components, it starts the ucp-reconcile container to converge the node to its desired state. It is expected for the ucp-reconcile container to remain in an exited state when the node is healthy. |
 | ucp-auth-api        | The centralized service for identity and authentication used by UCP and DTR                                                                                                                                                                                          |
@ -92,8 +92,8 @@ persist the state of UCP. These are the UCP services running on manager nodes:
 Worker nodes are the ones where you run your applications. These are the UCP
 services running on worker nodes:

-| UCP component |                                                                                                                             Description                                                                                                                              |
-| :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| UCP component | Description                                                                                                                                                                                                                                                          |
+|:--------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | ucp-agent     | Monitors the node and ensures the right UCP services are running                                                                                                                                                                                                     |
 | ucp-dsinfo    | Docker system information collection script to assist with troubleshooting                                                                                                                                                                                           |
 | ucp-reconcile | When ucp-agent detects that the node is not running the right UCP components, it starts the ucp-reconcile container to converge the node to its desired state. It is expected for the ucp-reconcile container to remain in an exited state when the node is healthy. |
@ -114,7 +114,7 @@ Docker UCP uses these named volumes to persist data in all nodes where it runs:
 | ucp-cluster-root-ca         | Root key material for the UCP root CA that issues certificates for swarm members         |
 | ucp-controller-client-certs | Certificate and keys used by the UCP web server to communicate with other UCP components |
 | ucp-controller-server-certs | Certificate and keys for the UCP web server running in the node                          |
-| ucp-kv                      | UCP configuration data, replicated across managers                                      |
+| ucp-kv                      | UCP configuration data, replicated across managers                                       |
 | ucp-kv-certs                | Certificates and keys for the key-value store                                            |
 | ucp-metrics-data            | Monitoring data gathered by UCP                                                          |
 | ucp-metrics-inventory       | Configuration file used by the ucp-metrics service                                       |
--- a/datacenter/ucp/3.0/guides/images/access-control-collection-architecture.png
+++ b/datacenter/ucp/3.0/guides/images/access-control-collection-architecture.png
--- a/datacenter/ucp/3.0/guides/images/access-control-grant-composition.png
+++ b/datacenter/ucp/3.0/guides/images/access-control-grant-composition.png
--- a/datacenter/ucp/3.0/guides/images/architecture-2.png
+++ b/datacenter/ucp/3.0/guides/images/architecture-2.png
--- a/datacenter/ucp/3.0/guides/images/check-contraints.png
+++ b/datacenter/ucp/3.0/guides/images/check-contraints.png
--- a/datacenter/ucp/3.0/guides/images/container-detail-2.png
+++ b/datacenter/ucp/3.0/guides/images/container-detail-2.png
--- a/datacenter/ucp/3.0/guides/images/container_detail.png
+++ b/datacenter/ucp/3.0/guides/images/container_detail.png
--- a/datacenter/ucp/3.0/guides/images/create-and-manage-teams-1.png
+++ b/datacenter/ucp/3.0/guides/images/create-and-manage-teams-1.png
--- a/datacenter/ucp/3.0/guides/images/create-and-manage-teams-2.png
+++ b/datacenter/ucp/3.0/guides/images/create-and-manage-teams-2.png
--- a/datacenter/ucp/3.0/guides/images/create-and-manage-teams-3.png
+++ b/datacenter/ucp/3.0/guides/images/create-and-manage-teams-3.png
--- a/datacenter/ucp/3.0/guides/images/create-and-manage-teams-4.png
+++ b/datacenter/ucp/3.0/guides/images/create-and-manage-teams-4.png
--- a/datacenter/ucp/3.0/guides/images/create-users-1-ucp3.png
+++ b/datacenter/ucp/3.0/guides/images/create-users-1-ucp3.png
--- a/datacenter/ucp/3.0/guides/images/create-users-1.png
+++ b/datacenter/ucp/3.0/guides/images/create-users-1.png
--- a/datacenter/ucp/3.0/guides/images/create-users-2-ucp3.png
+++ b/datacenter/ucp/3.0/guides/images/create-users-2-ucp3.png
--- a/datacenter/ucp/3.0/guides/images/create-users-2.png
+++ b/datacenter/ucp/3.0/guides/images/create-users-2.png
--- a/datacenter/ucp/3.0/guides/images/custom-role.png
+++ b/datacenter/ucp/3.0/guides/images/custom-role.png
--- a/datacenter/ucp/3.0/guides/images/deploy-a-service-3.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-a-service-3.png
--- a/datacenter/ucp/3.0/guides/images/deploy-app-cli-1.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-app-cli-1.png
--- a/datacenter/ucp/3.0/guides/images/deploy-app-ui-2.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-app-ui-2.png
--- a/datacenter/ucp/3.0/guides/images/deploy-app-ui-3.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-app-ui-3.png
--- a/datacenter/ucp/3.0/guides/images/deploy-app-ui-4.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-app-ui-4.png
--- a/datacenter/ucp/3.0/guides/images/deploy-app-ui-5.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-app-ui-5.png
--- a/datacenter/ucp/3.0/guides/images/deploy-app-ui-6.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-app-ui-6.png
--- a/datacenter/ucp/3.0/guides/images/deploy-compose-kubernetes-1.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-compose-kubernetes-1.png
--- a/datacenter/ucp/3.0/guides/images/deploy-view-only-service-1.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-view-only-service-1.png
--- a/datacenter/ucp/3.0/guides/images/deploy-view-only-service-2.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-view-only-service-2.png
--- a/datacenter/ucp/3.0/guides/images/deploy-view-only-service-3.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-view-only-service-3.png
--- a/datacenter/ucp/3.0/guides/images/deploy-view-only-service-4.png
+++ b/datacenter/ucp/3.0/guides/images/deploy-view-only-service-4.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-0.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-0.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-1.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-1.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-2.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-2.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-3.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-3.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-4.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-4.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-5.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-5.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-6.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-6.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-adv-custom-grant.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-adv-custom-grant.png
--- a/datacenter/ucp/3.0/guides/images/design-access-control-node-AC.png
+++ b/datacenter/ucp/3.0/guides/images/design-access-control-node-AC.png
--- a/datacenter/ucp/3.0/guides/images/docker-hub-license.png
+++ b/datacenter/ucp/3.0/guides/images/docker-hub-license.png
--- a/datacenter/ucp/3.0/guides/images/docker-hub-settings.png
+++ b/datacenter/ucp/3.0/guides/images/docker-hub-settings.png
--- a/datacenter/ucp/3.0/guides/images/monitor-ucp-2.png
+++ b/datacenter/ucp/3.0/guides/images/monitor-ucp-2.png
--- a/datacenter/ucp/3.0/guides/images/monitor-ucp-3.png
+++ b/datacenter/ucp/3.0/guides/images/monitor-ucp-3.png
--- a/datacenter/ucp/3.0/guides/images/multiple-replicas.png
+++ b/datacenter/ucp/3.0/guides/images/multiple-replicas.png
--- a/datacenter/ucp/3.0/guides/images/permissions-ucp.png
+++ b/datacenter/ucp/3.0/guides/images/permissions-ucp.png
--- a/datacenter/ucp/3.0/guides/images/rbac-howto-wpress-mysql-dba-22.png
+++ b/datacenter/ucp/3.0/guides/images/rbac-howto-wpress-mysql-dba-22.png
--- a/datacenter/ucp/3.0/guides/images/rbac-howto-wpress-mysql-dba-30.png
+++ b/datacenter/ucp/3.0/guides/images/rbac-howto-wpress-mysql-dba-30.png
--- a/datacenter/ucp/3.0/guides/images/role-diagram.svg
+++ b/datacenter/ucp/3.0/guides/images/role-diagram.svg
--- a/datacenter/ucp/3.0/guides/images/roles-and-permission.svg
+++ b/datacenter/ucp/3.0/guides/images/roles-and-permission.svg
--- a/datacenter/ucp/3.0/guides/images/secrets_video.png
+++ b/datacenter/ucp/3.0/guides/images/secrets_video.png
--- a/datacenter/ucp/3.0/guides/images/secure-your-infrastructure-1.svg
+++ b/datacenter/ucp/3.0/guides/images/secure-your-infrastructure-1.svg
@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="690px" height="213px" viewBox="0 0 690 213" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>secure-your-infrastructure-1</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="7.10542736e-15" width="263" height="87" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="263" height="87" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <rect id="path-3" x="0" y="7.10542736e-15" width="263" height="87" rx="2"></rect>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="263" height="87" fill="white">
-            <use xlink:href="#path-3"></use>
-        </mask>
-    </defs>
-    <g id="Apps" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="secure-your-infrastructure-1">
-            <g id="apps" transform="translate(214.000000, 11.000000)">
-                <g id="billing" transform="translate(0.000000, 105.000000)">
-                    <g id="label">
-                        <use id="Rectangle-153" stroke="#C0C9CE" mask="url(#mask-2)" stroke-width="4" stroke-dasharray="5,5,5,5" fill="#FFFFFF" xlink:href="#path-1"></use>
-                        <text id="com.docker.ucp.acces" font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                            <tspan x="6" y="16">com.docker.ucp.access.label = billing</tspan>
-                        </text>
-                    </g>
-                    <g id="containers" transform="translate(27.000000, 32.000000)">
-                        <path d="M40.25,0 L5.75,0 C2.5875,0 0,2.5875 0,5.75 L0,40.25 C0,43.4125 2.5875,46 5.75,46 L40.25,46 C43.4125,46 46,43.4125 46,40.25 L46,5.75 C46,2.5875 43.4125,0 40.25,0 L40.25,0 Z M40.25,40.25 L5.75,40.25 L5.75,5.75 L40.25,5.75 L40.25,40.25 L40.25,40.25 Z M31.625,14.375 L14.375,14.375 L14.375,31.625 L31.625,31.625 L31.625,14.375 L31.625,14.375 Z" id="container" fill="#00CBCA"></path>
-                        <path d="M94.25,0 L59.75,0 C56.5875,0 54,2.5875 54,5.75 L54,40.25 C54,43.4125 56.5875,46 59.75,46 L94.25,46 C97.4125,46 100,43.4125 100,40.25 L100,5.75 C100,2.5875 97.4125,0 94.25,0 L94.25,0 Z M94.25,40.25 L59.75,40.25 L59.75,5.75 L94.25,5.75 L94.25,40.25 L94.25,40.25 Z M85.625,14.375 L68.375,14.375 L68.375,31.625 L85.625,31.625 L85.625,14.375 L85.625,14.375 Z" id="container-copy" fill="#00CBCA"></path>
-                        <path d="M148.25,0 L113.75,0 C110.5875,0 108,2.5875 108,5.75 L108,40.25 C108,43.4125 110.5875,46 113.75,46 L148.25,46 C151.4125,46 154,43.4125 154,40.25 L154,5.75 C154,2.5875 151.4125,0 148.25,0 L148.25,0 Z M148.25,40.25 L113.75,40.25 L113.75,5.75 L148.25,5.75 L148.25,40.25 L148.25,40.25 Z M139.625,14.375 L122.375,14.375 L122.375,31.625 L139.625,31.625 L139.625,14.375 L139.625,14.375 Z" id="container-copy-2" fill="#00CBCA"></path>
-                        <path d="M202.25,0 L167.75,0 C164.5875,0 162,2.5875 162,5.75 L162,40.25 C162,43.4125 164.5875,46 167.75,46 L202.25,46 C205.4125,46 208,43.4125 208,40.25 L208,5.75 C208,2.5875 205.4125,0 202.25,0 L202.25,0 Z M202.25,40.25 L167.75,40.25 L167.75,5.75 L202.25,5.75 L202.25,40.25 L202.25,40.25 Z M193.625,14.375 L176.375,14.375 L176.375,31.625 L193.625,31.625 L193.625,14.375 L193.625,14.375 Z" id="container-copy-3" fill="#00CBCA"></path>
-                        <g id="container-copy-8">
-                            <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                        <g id="container-copy-9" transform="translate(54.000000, 0.000000)">
-                            <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                        <g id="container-copy-10" transform="translate(108.000000, 0.000000)">
-                            <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                        <g id="container-copy-11" transform="translate(162.000000, 0.000000)">
-                            <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                    </g>
-                </g>
-                <g id="crm">
-                    <g id="label">
-                        <use id="Rectangle-153" stroke="#C0C9CE" mask="url(#mask-4)" stroke-width="4" stroke-dasharray="5,5,5,5" fill="#FFFFFF" xlink:href="#path-3"></use>
-                        <text id="com.docker.ucp.acces" font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                            <tspan x="6" y="16">com.docker.ucp.access.label = crm</tspan>
-                        </text>
-                    </g>
-                    <g id="containers" transform="translate(27.000000, 32.000000)">
-                        <g id="container">
-                            <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                        <g id="container-copy-4" transform="translate(54.000000, 0.000000)">
-                            <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                        <g id="container-copy-5" transform="translate(108.000000, 0.000000)">
-                            <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                        <g id="container-copy-6" transform="translate(162.000000, 0.000000)">
-                            <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/datacenter/ucp/3.0/guides/images/secure-your-infrastructure-2.svg
+++ b/datacenter/ucp/3.0/guides/images/secure-your-infrastructure-2.svg
@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="690px" height="317px" viewBox="0 0 690 317" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>secure-your-infrastructure-2</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="7.10542736e-15" width="263" height="87" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="263" height="87" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <rect id="path-3" x="0" y="7.10542736e-15" width="263" height="87" rx="2"></rect>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="263" height="87" fill="white">
-            <use xlink:href="#path-3"></use>
-        </mask>
-        <rect id="path-5" x="0" y="0" width="690" height="317"></rect>
-        <mask id="mask-6" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="690" height="317" fill="white">
-            <use xlink:href="#path-5"></use>
-        </mask>
-    </defs>
-    <g id="Apps" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="secure-your-infrastructure-2">
-            <g id="Group" transform="translate(68.000000, 26.000000)">
-                <g id="teams" transform="translate(312.000000, 0.000000)">
-                    <g id="ops-team" transform="translate(189.000000, 0.000000)">
-                        <path d="M26.5,26.5 C33.820625,26.5 39.75,20.5540625 39.75,13.25 C39.75,5.929375 33.820625,0 26.5,0 C19.179375,0 13.25,5.929375 13.25,13.25 C13.25,20.5540625 19.179375,26.5 26.5,26.5 L26.5,26.5 Z M26.5,33.125 C17.6721875,33.125 0,37.5471875 0,46.375 L0,53 L53,53 L53,46.375 C53,37.5471875 35.3278125,33.125 26.5,33.125 L26.5,33.125 Z" id="Shape-Copy" fill="#9967FF"></path>
-                        <text font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                            <tspan x="0" y="68">ops team</tspan>
-                        </text>
-                    </g>
-                    <g id="billing-team" transform="translate(88.000000, 0.000000)">
-                        <text font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                            <tspan x="0" y="68">billing team</tspan>
-                        </text>
-                        <path d="M34.5,26.5 C41.820625,26.5 47.75,20.5540625 47.75,13.25 C47.75,5.929375 41.820625,0 34.5,0 C27.179375,0 21.25,5.929375 21.25,13.25 C21.25,20.5540625 27.179375,26.5 34.5,26.5 L34.5,26.5 Z M34.5,33.125 C25.6721875,33.125 8,37.5471875 8,46.375 L8,53 L61,53 L61,46.375 C61,37.5471875 43.3278125,33.125 34.5,33.125 L34.5,33.125 Z" id="Shape-Copy-2" fill="#00CBCA"></path>
-                    </g>
-                    <g id="crm-team">
-                        <text font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                            <tspan x="0" y="68">crm team</tspan>
-                        </text>
-                        <path d="M28.5,26.5 C35.820625,26.5 41.75,20.5540625 41.75,13.25 C41.75,5.929375 35.820625,0 28.5,0 C21.179375,0 15.25,5.929375 15.25,13.25 C15.25,20.5540625 21.179375,26.5 28.5,26.5 L28.5,26.5 Z M28.5,33.125 C19.6721875,33.125 2,37.5471875 2,46.375 L2,53 L55,53 L55,46.375 C55,37.5471875 37.3278125,33.125 28.5,33.125 L28.5,33.125 Z" id="Shape" fill="#1AAAF8"></path>
-                    </g>
-                </g>
-                <g id="apps" transform="translate(0.000000, 72.000000)">
-                    <g id="billing" transform="translate(0.000000, 105.000000)">
-                        <g id="label">
-                            <use id="Rectangle-153" stroke="#C0C9CE" mask="url(#mask-2)" stroke-width="4" stroke-dasharray="5,5,5,5" fill="#FFFFFF" xlink:href="#path-1"></use>
-                            <text id="com.docker.ucp.acces" font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                                <tspan x="6" y="16">com.docker.ucp.access.label = billing</tspan>
-                            </text>
-                        </g>
-                        <g id="containers" transform="translate(27.000000, 32.000000)">
-                            <path d="M40.25,0 L5.75,0 C2.5875,0 0,2.5875 0,5.75 L0,40.25 C0,43.4125 2.5875,46 5.75,46 L40.25,46 C43.4125,46 46,43.4125 46,40.25 L46,5.75 C46,2.5875 43.4125,0 40.25,0 L40.25,0 Z M40.25,40.25 L5.75,40.25 L5.75,5.75 L40.25,5.75 L40.25,40.25 L40.25,40.25 Z M31.625,14.375 L14.375,14.375 L14.375,31.625 L31.625,31.625 L31.625,14.375 L31.625,14.375 Z" id="container" fill="#00CBCA"></path>
-                            <path d="M94.25,0 L59.75,0 C56.5875,0 54,2.5875 54,5.75 L54,40.25 C54,43.4125 56.5875,46 59.75,46 L94.25,46 C97.4125,46 100,43.4125 100,40.25 L100,5.75 C100,2.5875 97.4125,0 94.25,0 L94.25,0 Z M94.25,40.25 L59.75,40.25 L59.75,5.75 L94.25,5.75 L94.25,40.25 L94.25,40.25 Z M85.625,14.375 L68.375,14.375 L68.375,31.625 L85.625,31.625 L85.625,14.375 L85.625,14.375 Z" id="container-copy" fill="#00CBCA"></path>
-                            <path d="M148.25,0 L113.75,0 C110.5875,0 108,2.5875 108,5.75 L108,40.25 C108,43.4125 110.5875,46 113.75,46 L148.25,46 C151.4125,46 154,43.4125 154,40.25 L154,5.75 C154,2.5875 151.4125,0 148.25,0 L148.25,0 Z M148.25,40.25 L113.75,40.25 L113.75,5.75 L148.25,5.75 L148.25,40.25 L148.25,40.25 Z M139.625,14.375 L122.375,14.375 L122.375,31.625 L139.625,31.625 L139.625,14.375 L139.625,14.375 Z" id="container-copy-2" fill="#00CBCA"></path>
-                            <path d="M202.25,0 L167.75,0 C164.5875,0 162,2.5875 162,5.75 L162,40.25 C162,43.4125 164.5875,46 167.75,46 L202.25,46 C205.4125,46 208,43.4125 208,40.25 L208,5.75 C208,2.5875 205.4125,0 202.25,0 L202.25,0 Z M202.25,40.25 L167.75,40.25 L167.75,5.75 L202.25,5.75 L202.25,40.25 L202.25,40.25 Z M193.625,14.375 L176.375,14.375 L176.375,31.625 L193.625,31.625 L193.625,14.375 L193.625,14.375 Z" id="container-copy-3" fill="#00CBCA"></path>
-                            <g id="container-copy-8">
-                                <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                            <g id="container-copy-9" transform="translate(54.000000, 0.000000)">
-                                <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                            <g id="container-copy-10" transform="translate(108.000000, 0.000000)">
-                                <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                            <g id="container-copy-11" transform="translate(162.000000, 0.000000)">
-                                <rect id="Rectangle-206" fill="#00CBCA" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="crm">
-                        <g id="label">
-                            <use id="Rectangle-153" stroke="#C0C9CE" mask="url(#mask-4)" stroke-width="4" stroke-dasharray="5,5,5,5" fill="#FFFFFF" xlink:href="#path-3"></use>
-                            <text id="com.docker.ucp.acces" font-family="OpenSans-Semibold, Open Sans" font-size="12" font-weight="500" fill="#C0C9CE">
-                                <tspan x="6" y="16">com.docker.ucp.access.label = crm</tspan>
-                            </text>
-                        </g>
-                        <g id="containers" transform="translate(27.000000, 32.000000)">
-                            <g id="container">
-                                <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                            <g id="container-copy-4" transform="translate(54.000000, 0.000000)">
-                                <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                            <g id="container-copy-5" transform="translate(108.000000, 0.000000)">
-                                <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                            <g id="container-copy-6" transform="translate(162.000000, 0.000000)">
-                                <rect id="Rectangle-206" fill="#1AAAF8" x="0" y="0.425607717" width="45.5743923" height="45.5743923" rx="4"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="10.1276427" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="20.2552855" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                                <rect id="Rectangle-207" fill="#FFFFFF" x="30.3829282" y="10.5532504" width="5.06382136" height="25.3191068"></rect>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-            <g id="permissions" transform="translate(388.000000, 143.000000)">
-                <g id="permissions-copy-5" transform="translate(185.000000, 88.000000)" fill="#445D6E">
-                    <path d="M12.09,0 C4.5,0 0,9 0,9 C0,9 4.5,18 12.09,18 C19.5,18 24,9 24,9 C24,9 19.5,0 12.09,0 L12.09,0 Z M12,15 C8.7,15 6,12.33 6,9 C6,5.7 8.7,3 12,3 C15.33,3 18,5.7 18,9 C18,12.33 15.33,15 12,15 L12,15 Z M15,9 C15,10.665 13.665,12 12,12 C10.335,12 9,10.665 9,9 C9,7.335 10.335,6 12,6 C13.665,6 15,7.335 15,9 L15,9 Z" id="Shape"></path>
-                    <path d="M32,14.0272045 L32,18 L35.9727791,18 L46.5668567,7.40587876 L42.5940776,3.4330833 L32,14.0272045 L32,14.0272045 Z M35.9727791,16.6757348 L33.3242597,16.6757348 L33.3242597,14.0272045 L34.6485194,14.0272045 L34.6485194,15.3514697 L35.9727791,15.3514697 L35.9727791,16.6757348 L35.9727791,16.6757348 Z M49.612654,4.36006891 L47.8911164,6.08161361 L43.9183373,2.10881814 L45.6398749,0.387273441 C45.8873057,0.139333807 46.2231988,-8.8817842e-15 46.573478,-8.8817842e-15 C46.9237573,-8.8817842e-15 47.2596503,0.139333807 47.5070811,0.387273441 L49.612654,2.49285504 C50.1291153,3.00931845 50.1291153,3.8436055 49.612654,4.36006891 L49.612654,4.36006891 Z" id="Shape"></path>
-                </g>
-                <g id="permissions-copy-4" transform="translate(91.000000, 88.000000)" fill="#445D6E">
-                    <path d="M12.09,0 C4.5,0 0,9 0,9 C0,9 4.5,18 12.09,18 C19.5,18 24,9 24,9 C24,9 19.5,0 12.09,0 L12.09,0 Z M12,15 C8.7,15 6,12.33 6,9 C6,5.7 8.7,3 12,3 C15.33,3 18,5.7 18,9 C18,12.33 15.33,15 12,15 L12,15 Z M15,9 C15,10.665 13.665,12 12,12 C10.335,12 9,10.665 9,9 C9,7.335 10.335,6 12,6 C13.665,6 15,7.335 15,9 L15,9 Z" id="Shape"></path>
-                    <path d="M32,14.0272045 L32,18 L35.9727791,18 L46.5668567,7.40587876 L42.5940776,3.4330833 L32,14.0272045 L32,14.0272045 Z M35.9727791,16.6757348 L33.3242597,16.6757348 L33.3242597,14.0272045 L34.6485194,14.0272045 L34.6485194,15.3514697 L35.9727791,15.3514697 L35.9727791,16.6757348 L35.9727791,16.6757348 Z M49.612654,4.36006891 L47.8911164,6.08161361 L43.9183373,2.10881814 L45.6398749,0.387273441 C45.8873057,0.139333807 46.2231988,-8.8817842e-15 46.573478,-8.8817842e-15 C46.9237573,-8.8817842e-15 47.2596503,0.139333807 47.5070811,0.387273441 L49.612654,2.49285504 C50.1291153,3.00931845 50.1291153,3.8436055 49.612654,4.36006891 L49.612654,4.36006891 Z" id="Shape"></path>
-                </g>
-                <g id="permissions-copy-3" transform="translate(0.000000, 88.000000)" fill="#C0C9CE">
-                    <path d="M12.09,0 C4.5,0 0,9 0,9 C0,9 4.5,18 12.09,18 C19.5,18 24,9 24,9 C24,9 19.5,0 12.09,0 L12.09,0 Z M12,15 C8.7,15 6,12.33 6,9 C6,5.7 8.7,3 12,3 C15.33,3 18,5.7 18,9 C18,12.33 15.33,15 12,15 L12,15 Z M15,9 C15,10.665 13.665,12 12,12 C10.335,12 9,10.665 9,9 C9,7.335 10.335,6 12,6 C13.665,6 15,7.335 15,9 L15,9 Z" id="Shape"></path>
-                    <path d="M32,14.0272045 L32,18 L35.9727791,18 L46.5668567,7.40587876 L42.5940776,3.4330833 L32,14.0272045 L32,14.0272045 Z M35.9727791,16.6757348 L33.3242597,16.6757348 L33.3242597,14.0272045 L34.6485194,14.0272045 L34.6485194,15.3514697 L35.9727791,15.3514697 L35.9727791,16.6757348 L35.9727791,16.6757348 Z M49.612654,4.36006891 L47.8911164,6.08161361 L43.9183373,2.10881814 L45.6398749,0.387273441 C45.8873057,0.139333807 46.2231988,-8.8817842e-15 46.573478,-8.8817842e-15 C46.9237573,-8.8817842e-15 47.2596503,0.139333807 47.5070811,0.387273441 L49.612654,2.49285504 C50.1291153,3.00931845 50.1291153,3.8436055 49.612654,4.36006891 L49.612654,4.36006891 Z" id="Shape"></path>
-                </g>
-                <g id="permissions-copy-2" transform="translate(185.000000, 0.000000)" fill="#445D6E">
-                    <path d="M12.09,0 C4.5,0 0,9 0,9 C0,9 4.5,18 12.09,18 C19.5,18 24,9 24,9 C24,9 19.5,0 12.09,0 L12.09,0 Z M12,15 C8.7,15 6,12.33 6,9 C6,5.7 8.7,3 12,3 C15.33,3 18,5.7 18,9 C18,12.33 15.33,15 12,15 L12,15 Z M15,9 C15,10.665 13.665,12 12,12 C10.335,12 9,10.665 9,9 C9,7.335 10.335,6 12,6 C13.665,6 15,7.335 15,9 L15,9 Z" id="Shape"></path>
-                    <path d="M32,14.0272045 L32,18 L35.9727791,18 L46.5668567,7.40587876 L42.5940776,3.4330833 L32,14.0272045 L32,14.0272045 Z M35.9727791,16.6757348 L33.3242597,16.6757348 L33.3242597,14.0272045 L34.6485194,14.0272045 L34.6485194,15.3514697 L35.9727791,15.3514697 L35.9727791,16.6757348 L35.9727791,16.6757348 Z M49.612654,4.36006891 L47.8911164,6.08161361 L43.9183373,2.10881814 L45.6398749,0.387273441 C45.8873057,0.139333807 46.2231988,-8.8817842e-15 46.573478,-8.8817842e-15 C46.9237573,-8.8817842e-15 47.2596503,0.139333807 47.5070811,0.387273441 L49.612654,2.49285504 C50.1291153,3.00931845 50.1291153,3.8436055 49.612654,4.36006891 L49.612654,4.36006891 Z" id="Shape"></path>
-                </g>
-                <g id="permissions-copy" transform="translate(91.000000, 0.000000)" fill="#C0C9CE">
-                    <path d="M12.09,0 C4.5,0 0,9 0,9 C0,9 4.5,18 12.09,18 C19.5,18 24,9 24,9 C24,9 19.5,0 12.09,0 L12.09,0 Z M12,15 C8.7,15 6,12.33 6,9 C6,5.7 8.7,3 12,3 C15.33,3 18,5.7 18,9 C18,12.33 15.33,15 12,15 L12,15 Z M15,9 C15,10.665 13.665,12 12,12 C10.335,12 9,10.665 9,9 C9,7.335 10.335,6 12,6 C13.665,6 15,7.335 15,9 L15,9 Z" id="Shape"></path>
-                    <path d="M32,14.0272045 L32,18 L35.9727791,18 L46.5668567,7.40587876 L42.5940776,3.4330833 L32,14.0272045 L32,14.0272045 Z M35.9727791,16.6757348 L33.3242597,16.6757348 L33.3242597,14.0272045 L34.6485194,14.0272045 L34.6485194,15.3514697 L35.9727791,15.3514697 L35.9727791,16.6757348 L35.9727791,16.6757348 Z M49.612654,4.36006891 L47.8911164,6.08161361 L43.9183373,2.10881814 L45.6398749,0.387273441 C45.8873057,0.139333807 46.2231988,-8.8817842e-15 46.573478,-8.8817842e-15 C46.9237573,-8.8817842e-15 47.2596503,0.139333807 47.5070811,0.387273441 L49.612654,2.49285504 C50.1291153,3.00931845 50.1291153,3.8436055 49.612654,4.36006891 L49.612654,4.36006891 Z" id="Shape"></path>
-                </g>
-                <g id="Shape" fill="#445D6E">
-                    <path d="M12.09,0 C4.5,0 0,9 0,9 C0,9 4.5,18 12.09,18 C19.5,18 24,9 24,9 C24,9 19.5,0 12.09,0 L12.09,0 Z M12,15 C8.7,15 6,12.33 6,9 C6,5.7 8.7,3 12,3 C15.33,3 18,5.7 18,9 C18,12.33 15.33,15 12,15 L12,15 Z M15,9 C15,10.665 13.665,12 12,12 C10.335,12 9,10.665 9,9 C9,7.335 10.335,6 12,6 C13.665,6 15,7.335 15,9 L15,9 Z"></path>
-                    <path d="M32,14.0272045 L32,18 L35.9727791,18 L46.5668567,7.40587876 L42.5940776,3.4330833 L32,14.0272045 L32,14.0272045 Z M35.9727791,16.6757348 L33.3242597,16.6757348 L33.3242597,14.0272045 L34.6485194,14.0272045 L34.6485194,15.3514697 L35.9727791,15.3514697 L35.9727791,16.6757348 L35.9727791,16.6757348 Z M49.612654,4.36006891 L47.8911164,6.08161361 L43.9183373,2.10881814 L45.6398749,0.387273441 C45.8873057,0.139333807 46.2231988,-8.8817842e-15 46.573478,-8.8817842e-15 C46.9237573,-8.8817842e-15 47.2596503,0.139333807 47.5070811,0.387273441 L49.612654,2.49285504 C50.1291153,3.00931845 50.1291153,3.8436055 49.612654,4.36006891 L49.612654,4.36006891 Z"></path>
-                </g>
-            </g>
-            <use id="border" stroke="#C0C9CE" mask="url(#mask-6)" stroke-width="2" xlink:href="#path-5"></use>
-        </g>
-    </g>
-</svg>
--- a/datacenter/ucp/3.0/guides/images/step-6-one-node.png
+++ b/datacenter/ucp/3.0/guides/images/step-6-one-node.png
--- a/datacenter/ucp/3.0/guides/images/step-6-two-nodes.png
+++ b/datacenter/ucp/3.0/guides/images/step-6-two-nodes.png
--- a/datacenter/ucp/3.0/guides/images/team-grant-diagram.svg
+++ b/datacenter/ucp/3.0/guides/images/team-grant-diagram.svg
--- a/datacenter/ucp/3.0/guides/images/ucp-grant-model.png
+++ b/datacenter/ucp/3.0/guides/images/ucp-grant-model.png
--- a/datacenter/ucp/3.0/guides/images/upgrade-ucp-4.png
+++ b/datacenter/ucp/3.0/guides/images/upgrade-ucp-4.png
--- a/datacenter/ucp/3.0/guides/images/view-only-access-diagram.svg
+++ b/datacenter/ucp/3.0/guides/images/view-only-access-diagram.svg
--- a/develop/dev-best-practices.md
+++ b/develop/dev-best-practices.md
@ -114,7 +114,7 @@ updates.
  another CI/CD pipeline to automatically build and tag a Docker image and test
  it. Docker Cloud can also deploy tested apps straight into production.

- Take this even further with [Docker EE](/enterprise/index.md) by requiring
+- Take this even further with [Docker EE](/ee/index.md) by requiring
  your development, testing, and security teams to sign images before they can
  be deployed into production. This way, you can be sure that before an image is
  deployed into production, it has been tested and signed off by, for instance,
--- a/enterprise/17.03/release-notes.md
+++ b/enterprise/17.03/release-notes.md
@ -2,6 +2,8 @@
 title: Docker EE 17.03 release notes
 description: Docker Enterprise Edition 17.03 release notes
 keywords: docker ee, release notes, upgrade
+redirect_from:
+ - /enterprise/17.03/release-notes/
 ---

 This document describes the latest changes, additions, known issues, and fixes
--- a/enterprise/17.06/index.md
+++ b/enterprise/17.06/index.md
@ -4,6 +4,7 @@ description: Docker Enterprise Edition 17.06 release notes
 keywords: docker ee, release notes, upgrade
 redirect_from:
 - /enterprise/release-notes/
+- /enterprise/17.06/
 - /enterprise/17.06/release-notes/
 toc_max: 2
 ---
--- a/enterprise/backup.md
+++ b/enterprise/backup.md
@ -9,6 +9,8 @@ next_steps:
 - path: upgrade/
  title: Upgrade Docker EE
 keywords: enterprise, backup, restore
+redirect_from:
+  - /enterprise/backup/
 ---
 {% if include.version=="dee-2.0" %}

@ -16,8 +18,8 @@ To backup Docker Enterprise Edition you need to create individual backups
 for each of the following components:

 1. Docker Swarm. [Backup Swarm resources like service and network definitions](/engine/swarm/admin_guide.md#back-up-the-swarm).
-2. Universal Control Plane (UCP). [Backup UCP configurations](/datacenter/ucp/3.0/guides/admin/backups-and-disaster-recovery.md).
-3. Docker Trusted Registry (DTR). [Backup DTR configurations and images](/datacenter/dtr/2.5/guides/admin/backups-and-disaster-recovery.md).
+2. Universal Control Plane (UCP). [Backup UCP configurations](/ee/ucp/admin/backups-and-disaster-recovery.md).
+3. Docker Trusted Registry (DTR). [Backup DTR configurations and images](/ee/dtr/admin/backups-and-disaster-recovery.md).

 Before proceeding to backup the next component, you should test the backup you've
 created to make sure it's not corrupt. One way to test your backups is to do
@ -37,7 +39,7 @@ To restore Docker Enterprise Edition, you need to restore the individual
 components one by one:

 1. Docker Engine. [Learn more](/engine/swarm/admin_guide.md#recover-from-disaster).
-2. Universal Control Plane (UCP). [Learn more](/datacenter/ucp/3.0/guides/admin/backups-and-disaster-recovery.md#restore-your-swarm).
-3. Docker Trusted Registry (DTR). [Learn more](/datacenter/dtr/2.5/guides/admin/backups-and-disaster-recovery.md#restore-dtr-data).
+2. Universal Control Plane (UCP). [Learn more](/ee/ucp/admin/backups-and-disaster-recovery.md#restore-your-swarm).
+3. Docker Trusted Registry (DTR). [Learn more](/ee/dtr/admin/backups-and-disaster-recovery.md#restore-dtr-data).

-{% endif %}
+{% endif %}
--- a/enterprise/docker-ee-architecture.md
+++ b/enterprise/docker-ee-architecture.md
@ -1,14 +1,14 @@
 ---
 title: Docker EE architecture
-description: Learn about the architecture of Docker Enterprise Edition and how it delivers high availability for your workloads. 
+description: Learn about the architecture of Docker Enterprise Edition and how it delivers high availability for your workloads.
 keywords: Docker EE, UCP, DTR,  architecture, orchestration, Kubernetes, Swarm, cluster, high availability
 ui_tabs:
 - version: dee-2.0
  orhigher: false
 next_steps:
- path: /datacenter/ucp/3.0/guides/ucp-architecture/
+- path: /ee/ucp/ucp-architecture/
  title: UCP architecture
- path: /datacenter/dtr/2.5/guides/architecture/
+- path: /ee/dtr/architecture/
  title: DTR architecture
 ---

@ -32,7 +32,7 @@ Docker EE provides access to the full API sets of three popular orchestrators:

 Docker EE proxies the underlying API of each orchestrator, giving you access
 to all of the capabilities of each orchestrator, along with the benefits of
-Docker EE, like role-based access control and Docker Content Trust. 
+Docker EE, like role-based access control and Docker Content Trust.

 ## Docker EE components

@ -45,21 +45,21 @@ deployment.

 - **Docker Trusted Registry (DTR)**: The production-grade image storage solution
  from Docker.
-  
+
  DTR is designed to scale horizontally as your usage increases.
  You can add more replicas to make DTR scale to your demand and for high
  availability.
-  
+
  All DTR replicas run the same set of services, and changes to
  their configuration are propagated automatically to other replicas.

 - **Universal Control Plane (UCP)**: Deploys applications from images, by
  managing orchestrators, like Kubernetes and Swarm.
-  
+
  UCP is designed for high availability (HA). You can join multiple UCP manager
  nodes to the cluster, and if one manager node fails, another takes its place
  automatically without impact to the cluster.
-  
+
  Changes to the configuration of one UCP manager node are propagated
  automatically to other nodes.

@ -78,23 +78,23 @@ containers and pods across your Docker cluster.
 UCP also secures Docker with role-based access control so that only authorized
 users can make changes and deploy applications to your cluster.

-![](/datacenter/ucp/3.0/guides/images/ucp-architecture-1.svg){: .with-border}
+![](/ee/ucp/images/ucp-architecture-1.svg){: .with-border}

 Once a UCP instance is deployed, you don't interact with Docker EE Engine
 directly. Instead, you interact with UCP. Since UCP exposes the standard
 Docker API and the full Kubernetes API transparently, you can use the tools
 you already know and love, like `kubectl`, the Docker CLI client, and Docker
 Compose.
-[Learn about UCP architecture](/datacenter/ucp/3.0/guides/ucp-architecture.md).
+[Learn about UCP architecture](/ee/ucp/ucp-architecture.md).

-![](/datacenter/ucp/3.0/guides/images/ucp-architecture-2.svg){: .with-border}
+![](/ee/ucp/images/ucp-architecture-2.svg){: .with-border}

 ### Docker Trusted Registry (DTR)

 Docker Trusted Registry (DTR) is a containerized application that runs on a
 Docker UCP cluster.

-![](/datacenter/dtr/2.5/guides/images/architecture-1.svg){: .with-border}
+![](/ee/dtr/images/architecture-1.svg){: .with-border}

 Once you have DTR deployed, you use your Docker CLI client to login, push, and
 pull images.
@ -102,10 +102,10 @@ pull images.
 For high-availability, you can deploy multiple DTR replicas, one on each UCP
 worker node.

-![](/datacenter/dtr/2.5/guides/images/architecture-2.svg){: .with-border}
+![](/ee/dtr/images/architecture-2.svg){: .with-border}

 All DTR replicas run the same set of services, and changes to their configuration
 are automatically propagated to other replicas.
-[Learn about DTR architecture](/datacenter/dtr/2.5/guides/architecture.md).
+[Learn about DTR architecture](/ee/dtr/architecture.md).

-{% endif %}
+{% endif %}
--- a/datacenter/dtr/2.5/guides/admin/configure/allow-creation-on-push.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/allow-creation-on-push.md
@ -8,6 +8,8 @@ ui_tabs:
  orlower: true
 cli_tabs:
 - version: cli
+redirect_from:
+  - /datacenter/dtr/2.5/guides/admin/configure/allow-creation-on-push/
 ---

 {% if include.ui %}
--- a/datacenter/dtr/2.5/guides/admin/configure/deploy-caches/chaining.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/deploy-caches/chaining.md
--- a/datacenter/dtr/2.5/guides/admin/configure/deploy-caches/index.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/deploy-caches/index.md
--- a/datacenter/dtr/2.5/guides/admin/configure/deploy-caches/tls.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/deploy-caches/tls.md
--- a/datacenter/dtr/2.5/guides/admin/configure/enable-single-sign-on.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/enable-single-sign-on.md
--- a/datacenter/dtr/2.5/guides/admin/configure/external-storage/index.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/external-storage/index.md
--- a/datacenter/dtr/2.5/guides/admin/configure/external-storage/nfs.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/external-storage/nfs.md
--- a/datacenter/dtr/2.5/guides/admin/configure/external-storage/s3.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/external-storage/s3.md
--- a/datacenter/dtr/2.5/guides/admin/configure/garbage-collection.md
+++ b/datacenter/dtr/2.5/guides/admin/configure/garbage-collection.md
--- a/Show More
+++ b/Show More