Merge branch 'release-1.5' of github.com:kubernetes/kubernetes.github.io into ss-basics

2016-12-01 12:35:14 -08:00
parent 5e15fc667f f9b5c0649f
commit 76e314e32a
100 changed files with 2357 additions and 2092 deletions
@@ -14,6 +14,8 @@ toc:
    path: /docs/getting-started-guides/kops/
  - title: Hello World on Google Container Engine
    path: /docs/hellonode/
+  - title: Installing kubectl
+    path: /docs/getting-started-guides/kubectl/
  - title: Downloading or Building Kubernetes
    path: /docs/getting-started-guides/binary_release/
  - title: Online Training Course
@@ -68,9 +70,9 @@ toc:
    section:
    - title: Example Walkthrough
      path: /docs/getting-started-guides/network-policy/walkthrough/
-    - title: Using Calico for NetworkPolicy 
+    - title: Using Calico for NetworkPolicy
      path: /docs/getting-started-guides/network-policy/calico/
-    - title: Using Romana for NetworkPolicy 
+    - title: Using Romana for NetworkPolicy
      path: /docs/getting-started-guides/network-policy/romana/

 - title: Batch Jobs
@@ -83,6 +85,8 @@ toc:
    path: /docs/user-guide/jobs/work-queue-1/
  - title: Fine Parallel Processing using a Work Queue
    path: /docs/user-guide/jobs/work-queue-2/
+  - title: Cron Jobs
+    path: /docs/user-guide/cron-jobs/

 - title: Service Discovery and Load Balancing
  section:
@@ -207,8 +211,6 @@ toc:
        path: /docs/getting-started-guides/ovirt/
      - title: OpenStack Heat
        path: /docs/getting-started-guides/openstack-heat/
-      - title: CoreOS on Multinode Cluster
-        path: /docs/getting-started-guides/coreos/coreos_multinode_cluster/
      - title: rkt
        section:
        - title: Running Kubernetes with rkt
@@ -233,12 +235,8 @@ toc:
        path: /docs/getting-started-guides/centos/centos_manual_config/
      - title: CoreOS
        path: /docs/getting-started-guides/coreos
-      - title: CoreOS with Calico
-        path: /docs/getting-started-guides/coreos/bare_metal_calico/
      - title: Ubuntu
        path: /docs/getting-started-guides/ubuntu/
-      - title: Ubuntu Nodes with Calico
-        path: /docs/getting-started-guides/ubuntu-calico/
    - title: Validate Node Setup
      path: /docs/admin/node-conformance
  - title: Portable Multi-Node Cluster
@@ -297,7 +295,7 @@ toc:
  - title: Configuring kubelet Garbage Collection
    path: /docs/admin/garbage-collection/
  - title: Configuring Out Of Resource Handling
-    path: /docs/admin/out-of-resource/    
+    path: /docs/admin/out-of-resource/
  - title: Configuring Kubernetes with Salt
    path: /docs/admin/salt/
  - title: Monitoring Node Health
@@ -40,13 +40,13 @@ toc:
    path: /docs/api-reference/batch/v1/operations/
  - title: Batch API Definitions
    path: /docs/api-reference/batch/v1/definitions/
-    
+
 - title: Extensions API
  section:
  - title: Extensions API Operations
    path: /docs/api-reference/extensions/v1beta1/operations/
  - title: Extensions API Definitions
-    path: /docs/api-reference/extensions/v1beta1/definitions/    
+    path: /docs/api-reference/extensions/v1beta1/definitions/

 - title: kubectl CLI
  section:
@@ -172,7 +172,7 @@ toc:
  - title: kube-apiserver
    path: /docs/admin/kube-apiserver/
  - title: kube-controller-manager
-    path: /docs/admin/kube-controller-manager/    
+    path: /docs/admin/kube-controller-manager/
  - title: kube-proxy
    path: /docs/admin/kube-proxy/
  - title: kube-scheduler
@@ -183,33 +183,33 @@ toc:
 - title: Glossary
  section:
  - title: Annotations
-    path: /docs/user-guide/annotations/  
+    path: /docs/user-guide/annotations/
  - title: Daemon Sets
    path: /docs/admin/daemons/
-  - title: Deployments    
+  - title: Deployments
    path: /docs/user-guide/deployments/
  - title: Horizontal Pod Autoscaling
-    path: /docs/user-guide/horizontal-pod-autoscaling/    
+    path: /docs/user-guide/horizontal-pod-autoscaling/
  - title: Images
    path: /docs/user-guide/images/
  - title: Ingress Resources
-    path: /docs/user-guide/ingress/    
+    path: /docs/user-guide/ingress/
  - title: Jobs
-    path: /docs/user-guide/jobs/    
+    path: /docs/user-guide/jobs/
  - title: Labels and Selectors
    path: /docs/user-guide/labels/
  - title: Names
    path: /docs/user-guide/identifiers/
  - title: Namespaces
    path: /docs/user-guide/namespaces/
-  - title: Network Policies 
-    path: /docs/user-guide/networkpolicies/    
+  - title: Network Policies
+    path: /docs/user-guide/networkpolicies/
  - title: Nodes
-    path: /docs/admin/node/    
+    path: /docs/admin/node/
  - title: Persistent Volumes
-    path: /docs/user-guide/persistent-volumes/    
+    path: /docs/user-guide/persistent-volumes/
  - title: Pet Sets
-    path: /docs/user-guide/petset/    
+    path: /docs/user-guide/petset/
  - title: Pods
    path: /docs/user-guide/pods/
  - title: Pod Security Policies
@@ -217,11 +217,11 @@ toc:
  - title: Replica Sets
    path: /docs/user-guide/replicasets/
  - title: Replication Controller
-    path: /docs/user-guide/replication-controller/    
+    path: /docs/user-guide/replication-controller/
  - title: Resource Quotas
-    path: /docs/admin/resource-quota/    
-  - title: Scheduled Jobs
-    path: /docs/user-guide/scheduled-jobs/
+    path: /docs/admin/resourcequota/
+  - title: Cron Jobs
+    path: /docs/user-guide/cron-jobs/
  - title: Secrets
    path: /docs/user-guide/secrets/
  - title: Security Context
@@ -244,11 +244,11 @@ toc:
  - title: Kubernetes Identity and Access Management
    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/access.md
  - title: Kubernetes OpenVSwitch GRE/VxLAN networking
-    path: /docs/admin/ovs-networking/    
+    path: /docs/admin/ovs-networking/
  - title: Security Contexts
    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
  - title: Security in Kubernetes
-    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md    
+    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md

 - title: Federation
  section:
@@ -269,6 +269,6 @@ toc:
  - title: Federation Components
    section:
    - title: federation-apiserver
-      path: /docs/admin/federation-apiserver.md
+      path: /docs/admin/federation-apiserver
    - title : federation-controller-mananger
-      path: /docs/admin/federation-controller-manager.md
+      path: /docs/admin/federation-controller-manager
@@ -14,6 +14,8 @@ toc:
    path: /docs/contribute/stage-documentation-changes/
  - title: Using Page Templates
    path: /docs/contribute/page-templates/
+  - title: Documentation Style Guide
+    path: /docs/contribute/style-guide/

 - title: Troubleshooting
  section:
@@ -51,5 +53,3 @@ toc:
    path: https://github.com/kubernetes/kubernetes/milestones/
  - title: Contributing to Kubernetes Documentation
    path: /editdocs/
-  - title: New Template Instructions
-    path: /docs/templatedemos/
@@ -15,6 +15,14 @@ toc:
  section:
  - title: Using Port Forwarding to Access Applications in a Cluster
    path: /docs/tasks/access-application-cluster/port-forward-access-application-cluster/
+
+
+- title: Debugging Applications in a Cluster
+  section:
+  - title: Determining the Reason for Pod Failure
+    path: /docs/tasks/debug-application-cluster/determine-reason-pod-failure/
+
+
 - title: Accessing the Kubernetes API
  section:
  - title: Using an HTTP Proxy to Access the Kubernetes API
@@ -54,4 +54,6 @@ toc:
 - title: Stateful Applications
  section:
  - title: StatefulSet Basics
-    path: /docs/tutorials/stateful-application/basic-stateful-set/
+    path: /docs/tutorials/stateful-application/basic-stateful-set/
+  - title: Running a Single-Instance Stateful Application
+    path: /docs/tutorials/stateful-application/run-stateful-application/