Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""

This reverts commit 4c95d16.

Author: bermudezmt

_config.yml

@@ -23,7 +23,7 @@ latest_stable_docker_engine_api_version: "1.37"
 docker_ce_stable_version: "18.03"
 docker_ce_edge_version: "18.05"
 docker_ee_version: "17.06"
-compose_version: "1.21.2"
+compose_version: "1.22.0"
 machine_version: "0.14.0"
 distribution_version: "2.6"
 dtr_version: "2.5"
@@ -92,7 +92,7 @@ defaults:
   - scope:
       path: "install"
     values:
-      win_latest_build: "docker-17.06.2-ee-8"
+      win_latest_build: "docker-17.06.2-ee-16"
   - scope:
       path: "datacenter"
     values:
@@ -102,27 +102,27 @@ defaults:
     values:
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.5.0"
+      dtr_version: "2.5.3"
   - scope:
       path: "datacenter/dtr/2.4"
     values:
       hide_from_sitemap: true
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.4.3"
+      dtr_version: "2.4.6"
   - scope:
       path: "datacenter/dtr/2.3"
     values:
       hide_from_sitemap: true
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.3.6"
+      dtr_version: "2.3.8"
   - scope:
       path: "datacenter/dtr/2.2"
     values:
       ucp_version: "2.1"
       dtr_version: "2.2"
-      docker_image: "docker/dtr:2.2.11"
+      docker_image: "docker/dtr:2.2.12"
   - scope:
       path: "datacenter/dtr/2.1"
     values:
@@ -138,38 +138,41 @@ defaults:
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "3.0.0"
+      ucp_version: "3.0.4"
   - scope: # This is a bit of a hack for the get-support.md topic.
       path: "ee"
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
       dtr_repo: "dtr"
-      ucp_version: "3.0.0"
+      ucp_version: "3.0.4"
       dtr_version: "2.5.0"
-      dtr_latest_image: "docker/dtr:2.5.0"
+      dtr_latest_image: "docker/dtr:2.5.3"
   - scope:
       path: "datacenter/ucp/2.2"
     values:
       hide_from_sitemap: true
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "2.2.9"
+      ucp_version: "2.2.12"
   - scope:
       path: "datacenter/ucp/2.1"
     values:
+      hide_from_sitemap: true
       ucp_version: "2.1"
       dtr_version: "2.2"
       docker_image: "docker/ucp:2.1.8"
   - scope:
       path: "datacenter/ucp/2.0"
     values:
+      hide_from_sitemap: true
       ucp_version: "2.0"
       dtr_version: "2.1"
-      docker_image: "docker/ucp:2.0.3"
+      docker_image: "docker/ucp:2.0.4"
   - scope:
       path: "datacenter/ucp/1.1"
     values:
+      hide_from_sitemap: true
       ucp_version: "1.1"
       dtr_version: "2.0"
 

_data/ddc_offline_files_2.yaml

@@ -6,14 +6,62 @@
 - product: "ucp"
   version: "3.0"
   tar-files:
+    - description: "3.0.4 Linux"
+      url: https://packages.docker.com/caas/ucp_images_3.0.4.tar.gz
+    - description: "3.0.4 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_3.0.4.tar.gz
+    - description: "3.0.4 Windows Server 2016 LTSC"
+      url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.4.tar.gz
+    - description: "3.0.4 Windows Server 1709"
+      url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.4.tar.gz
+    - description: "3.0.4 Windows Server 1803"
+      url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.4.tar.gz
+    - description: "3.0.3 Linux"
+      url: https://packages.docker.com/caas/ucp_images_3.0.3.tar.gz
+    - description: "3.0.3 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_3.0.3.tar.gz
+    - description: "3.0.3 Windows Server 2016 LTSC"
+      url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.3.tar.gz
+    - description: "3.0.3 Windows Server 1709"
+      url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.3.tar.gz
+    - description: "3.0.3 Windows Server 1803"
+      url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.3.tar.gz
+    - description: "3.0.2 Linux"
+      url: https://packages.docker.com/caas/ucp_images_3.0.2.tar.gz
+    - description: "3.0.2 Windows Server 2016 LTSC"
+      url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.2.tar.gz
+    - description: "3.0.2 Windows Server 1709"
+      url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.2.tar.gz
+    - description: "3.0.1 Linux"
+      url: https://packages.docker.com/caas/ucp_images_3.0.1.tar.gz
+    - description: "3.0.1 Windows Server 2016 LTSC"
+      url: https://packages.docker.com/caas/ucp_images_win_3.0.1.tar.gz
     - description: "3.0.0 Linux"
       url: https://packages.docker.com/caas/ucp_images_3.0.0.tar.gz
-    - description: "3.0.0 Windows"
+    - description: "3.0.0 Windows Server 2016 LTSC"
       url: https://packages.docker.com/caas/ucp_images_win_3.0.0.tar.gz
 - product: "ucp"
   version: "2.2"
   tar-files:
-    - description: "2.2.9 Linux"
+    - description: "2.2.12 Linux"
+      url: https://packages.docker.com/caas/ucp_images_2.2.12.tar.gz
+    - description: "2.2.12 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_2.2.12.tar.gz
+    - description: "2.2.12 Windows"
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.12.tar.gz  
+    - description: "2.2.11 Linux"
+      url: https://packages.docker.com/caas/ucp_images_2.2.11.tar.gz
+    - description: "2.2.11 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_2.2.11.tar.gz
+    - description: "2.2.11 Windows"
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.11.tar.gz  
+    - description: "2.2.10 Linux"
+      url: https://packages.docker.com/caas/ucp_images_2.2.10.tar.gz
+    - description: "2.2.10 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_2.2.10.tar.gz
+    - description: "2.2.10 Windows"
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.10.tar.gz
+    - description: "2.2.10 Linux"
       url: https://packages.docker.com/caas/ucp_images_2.2.9.tar.gz
     - description: "2.2.9 IBM Z"
       url: https://packages.docker.com/caas/ucp_images_s390x_2.2.9.tar.gz
@@ -64,13 +112,41 @@
 - product: "dtr"
   version: "2.5"
   tar-files:
+    - description: "DTR 2.5.4 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.5.4.tar.gz
+    - description: "DTR 2.5.4 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.4.tar.gz
+    - description: "DTR 2.5.3 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.5.3.tar.gz
+    - description: "DTR 2.5.3 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.3.tar.gz
+    - description: "DTR 2.5.2 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.5.2.tar.gz
+    - description: "DTR 2.5.2 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.2.tar.gz
+    - description: "DTR 2.5.1 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.5.1.tar.gz
+    - description: "DTR 2.5.1 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.1.tar.gz
     - description: "DTR 2.5.0 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.5.0.tar.gz
-    - description: "DTR 2.4.3 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.4.3.tar.gz
+    - description: "DTR 2.5.0 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.0.tar.gz
 - product: "dtr"
   version: "2.4"
   tar-files:
+    - description: "DTR 2.4.6 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz
+    - description: "DTR 2.4.6 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz  
+    - description: "DTR 2.4.5 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.4.5.tar.gz
+    - description: "DTR 2.4.5 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.4.5.tar.gz
+    - description: "DTR 2.4.4 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.4.4.tar.gz
+    - description: "DTR 2.4.4 IBM Z"
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.4.4.tar.gz
     - description: "DTR 2.4.3 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.4.3.tar.gz
     - description: "DTR 2.4.3 IBM Z"
@@ -90,6 +166,10 @@
 - product: "dtr"
   version: "2.3"
   tar-files:
+    - description: "DTR 2.3.8"
+      url: https://packages.docker.com/caas/dtr_images_2.3.8.tar.gz  
+    - description: "DTR 2.3.7"
+      url: https://packages.docker.com/caas/dtr_images_2.3.7.tar.gz
     - description: "DTR 2.3.6"
       url: https://packages.docker.com/caas/dtr_images_2.3.6.tar.gz
     - description: "DTR 2.3.5"

_data/engine-cli/docker_load.yaml

@@ -28,7 +28,7 @@ options:
   swarm: false
 examples: |-
   ```bash
-  $ docker docker image ls
+  $ docker image ls
 
   REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE