Merge branch 'vnext-compose' into master

docker · Jan 19, 2017 · ea94cca · ea94cca
2 parents 00763da + f1c9e8f
commit ea94cca
Show file tree

Hide file tree

Showing 22 changed files with 1,305 additions and 24 deletions.
diff --git a/_data/toc.yaml b/_data/toc.yaml
@@ -91,6 +91,58 @@ toc:
       title: Open Source Licensing
     - path: /docker-for-azure/release-notes/
       title: Release Notes
+
+- sectiontitle: Get started
+  section:
+  - path: /learn/
+    title: Learn Docker
+  - sectiontitle: Docker basics
+    section:
+    - path: /engine/getstarted/
+      title: Get Started with Docker
+    - path: /engine/getstarted/step_one/
+      title: Install Docker and run hello-world
+    - path: /engine/getstarted/step_two/
+      title: Understand images &amp; containers
+    - path: /engine/getstarted/step_three/
+      title: Find &amp; run the whalesay image
+    - path: /engine/getstarted/step_four/
+      title: Build your own image
+    - path: /engine/getstarted/step_five/
+      title: Create a Docker Hub account &amp; repository
+    - path: /engine/getstarted/step_six/
+      title: Tag, push, &amp; pull your image
+    - path: /engine/getstarted/last_page/
+      title: Learning more
+  - sectiontitle: Define and deploy your app
+    section:
+    - path: /engine/getstarted-voting-app/
+      title: Tour the voting app sample
+    - path: /engine/getstarted-voting-app/node-setup/
+      title: Set up Dockerized machines
+    - path: /engine/getstarted-voting-app/create-swarm/
+      title: Create a swarm
+    - path: /engine/getstarted-voting-app/deploy-app/
+      title: Deploy the app
+    - path: /engine/getstarted-voting-app/test-drive/
+      title: Try out the voting app
+    - path: /engine/getstarted-voting-app/customize-app/
+      title: Customize the app and redploy
+  - sectiontitle: Learn by example
+    section:
+    - path: /engine/tutorials/dockerizing/
+      title: Hello world in a container
+    - path: /engine/tutorials/usingdocker/
+      title: Run a simple application
+    - path: /engine/tutorials/dockerimages/
+      title: Build your own images
+    - path: /engine/tutorials/networkingcontainers/
+      title: Network containers
+    - path: /engine/tutorials/dockervolumes/
+      title: Manage data in containers
+    - path: /engine/tutorials/dockerrepos/
+      title: Store images on Docker Hub
+
 - sectiontitle: Docker ID
   section:
   - path: /docker-id/
@@ -131,6 +183,9 @@ toc:
       title: Manage data in containers
     - path: /engine/tutorials/dockerrepos/
       title: Store images on Docker Hub
+
+- sectiontitle: Docker Engine
+  section:
   - sectiontitle: User Guide
     section:
     - path: /engine/userguide/intro/