Merge with origin brach

ameyag · Sep 23, 2019 · d2f5271 · d2f5271
2 parents af5d13a + 8f72dda
commit d2f5271
Show file tree

Hide file tree

Showing 29 changed files with 1,347 additions and 628 deletions.
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -38,7 +38,7 @@
         {
             "source_path": "virtualization/windowscontainers/docker/manage_windows_dockerfile.md",
             "redirect_url": "/virtualization/windowscontainers/manage-docker/manage-windows-dockerfile",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path": "virtualization/windowscontainers/docker/optimize_windows_dockerfile.md",
@@ -87,17 +87,32 @@
         },
         {
             "source_path": "virtualization/windowscontainers/quick_start/quick_start_images.md",
-            "redirect_url": "/virtualization/windowscontainers/quick-start/quick-start-images",
+            "redirect_url": "/virtualization/windowscontainers/manage-docker/manage-windows-dockerfile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "virtualization/windowscontainers/quick-start/quick-start-images.md",
+            "redirect_url": "/virtualization/windowscontainers/manage-docker/manage-windows-dockerfile",
             "redirect_document_id": true
         },
         {
             "source_path": "virtualization/windowscontainers/quick_start/quick_start_windows_10.md",
-            "redirect_url": "/virtualization/windowscontainers/quick-start/quick-start-windows-10",
+            "redirect_url": "/virtualization/windowscontainers/quick-start/set-up-environment?tabs=Windows-10-Client",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "virtualization/windowscontainers/quick-start/quick-start-windows-10.md",
+            "redirect_url": "/virtualization/windowscontainers/quick-start/set-up-environment?tabs=Windows-10-Client",
             "redirect_document_id": true
         },
         {
             "source_path": "virtualization/windowscontainers/quick_start/quick_start_windows_server.md",
-            "redirect_url": "/virtualization/windowscontainers/quick-start/quick-start-windows-server",
+            "redirect_url": "/virtualization/windowscontainers/quick-start/set-up-environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "virtualization/windowscontainers/quick-start/quick-start-windows-server.md",
+            "redirect_url": "/virtualization/windowscontainers/quick-start/set-up-environment",
             "redirect_document_id": true
         },
         {

diff --git a/virtualization/windowscontainers/Media/container-reference.svg b/virtualization/windowscontainers/Media/container-reference.svg
diff --git a/virtualization/windowscontainers/Media/container-tutorials.svg b/virtualization/windowscontainers/Media/container-tutorials.svg
diff --git a/virtualization/windowscontainers/Media/containers-quick-start.svg b/virtualization/windowscontainers/Media/containers-quick-start.svg
diff --git a/virtualization/windowscontainers/Media/i_blog.svg b/virtualization/windowscontainers/Media/i_blog.svg