Merge branch 'master' into commands-capabilities

This commit is contained in:
Steve Perry
2017-02-01 14:21:38 -08:00
committed by GitHub
23 changed files with 1686 additions and 585 deletions
+4 -1
View File
@@ -6,7 +6,10 @@ toc:
- title: Kubectl Command Line
section:
- docs/concepts/tools/kubectl/object-management-overview.md
- docs/concepts/tools/kubectl/object-management-using-imperative-commands.md
- docs/concepts/tools/kubectl/object-management-using-imperative-config.md
- docs/concepts/tools/kubectl/object-management-using-declarative-config.md
- title: Kubernetes Objects
section:
- docs/concepts/abstractions/overview.md
+6 -11
View File
@@ -3,17 +3,7 @@ abstract: "How to get started, and accomplish tasks, using Kubernetes."
toc:
- docs/user-guide/index.md
- title: Getting Started
section:
- docs/whatisk8s.md
- docs/getting-started-guides/kubeadm.md
- docs/getting-started-guides/kops.md
- docs/getting-started-guides/kargo.md
- docs/hellonode.md
- docs/getting-started-guides/kubectl.md
- docs/getting-started-guides/binary_release.md
- title: Online Training Course
path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
- docs/whatisk8s.md
- title: Accessing the Cluster
section:
@@ -119,11 +109,14 @@ toc:
- title: Running Kubernetes on Custom Solutions
section:
- docs/getting-started-guides/scratch.md
- docs/getting-started-guides/kubeadm.md
- title: Custom Cloud Solutions
section:
- docs/getting-started-guides/coreos/index.md
- docs/getting-started-guides/ubuntu/index.md
- docs/getting-started-guides/rackspace.md
- docs/getting-started-guides/kops.md
- docs/getting-started-guides/kargo.md
- title: On-Premise VMs
section:
- docs/getting-started-guides/coreos/index.md
@@ -164,6 +157,7 @@ toc:
- docs/getting-started-guides/ubuntu/troubleshooting.md
- docs/getting-started-guides/ubuntu/decommissioning.md
- docs/getting-started-guides/ubuntu/calico.md
- docs/getting-started-guides/ubuntu/operational-considerations.md
- docs/getting-started-guides/ubuntu/glossary.md
- docs/getting-started-guides/ubuntu/local.md
- docs/getting-started-guides/ubuntu/logging.md
@@ -174,6 +168,7 @@ toc:
- docs/admin/cluster-large.md
- docs/admin/multiple-zones.md
- docs/admin/high-availability/index.md
- docs/getting-started-guides/binary_release.md
- title: Administering Clusters
section:
+3 -1
View File
@@ -29,9 +29,11 @@ toc:
section:
- docs/tutorials/kubernetes-basics/update-intro.html
- docs/tutorials/kubernetes-basics/update-interactive.html
- title: Online Training Course
path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
- docs/tutorials/stateless-application/hello-minikube.md
- title: Stateless Applications
section:
- docs/tutorials/stateless-application/hello-minikube.md
- docs/tutorials/stateless-application/run-stateless-application-deployment.md
- docs/tutorials/stateless-application/expose-external-ip-address-service.md
- docs/tutorials/stateless-application/expose-external-ip-address.md