Merge branch 'master' into page-version

This commit is contained in:
Andrew Chen
2017-01-24 13:11:07 -08:00
committed by GitHub
1664 changed files with 6583 additions and 117825 deletions
-3
View File
@@ -65,11 +65,8 @@ toc:
- title: Containers and Pods
section:
- docs/user-guide/simple-nginx.md
- docs/user-guide/pods/single-container.md
- docs/user-guide/pods/multi-container.md
- docs/user-guide/pods/init-container.md
- docs/user-guide/configuring-containers.md
- docs/user-guide/pod-templates.md
- docs/user-guide/containers.md
- docs/user-guide/environment-guide/index.md