Merge branch 'master' into download_kubectl

_data/concepts.yml

@@ -1,4 +1,5 @@
 bigheader: "Concepts"
+abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
 toc:
 - title: Concepts
   path: /docs/concepts/

_data/docs-home.yml

@@ -0,0 +1,5 @@
+bigheader: "Kubernetes Documentation"
+abstract: "Documentation for using and learning about Kubernetes."
+toc:
+- title: Kubernetes Documentation
+  path: /docs/

_data/globals.yml

@@ -1,4 +1,5 @@
 tocs:
+- docs-home
 - guides
 - tutorials
 - tasks

_data/guides.yml

@@ -1,8 +1,8 @@
 bigheader: "Guides"
-abstract: "How to get started, and achieve tasks, using Kubernetes"
+abstract: "How to get started, and accomplish tasks, using Kubernetes."
 toc:
 - title: Guides
-  path: /docs/
+  path: /docs/user-guide/
 
 - title: Getting Started
   section:
@@ -10,6 +10,8 @@ toc:
     path: /docs/whatisk8s/
   - title: Installing Kubernetes on Linux with kubeadm
     path: /docs/getting-started-guides/kubeadm/
+  - title: Installing Kubernetes on AWS with kops
+    path: /docs/getting-started-guides/kops/
   - title: Hello World on Google Container Engine
     path: /docs/hellonode/
   - title: Installing kubectl
@@ -70,6 +72,8 @@ toc:
       path: /docs/getting-started-guides/network-policy/walkthrough/
     - title: Using Calico for NetworkPolicy 
       path: /docs/getting-started-guides/network-policy/calico/
+    - title: Using Romana for NetworkPolicy 
+      path: /docs/getting-started-guides/network-policy/romana/
 
 - title: Batch Jobs
   section:

_data/samples.yml

@@ -12,6 +12,8 @@ toc:
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/
   - title: CephFS
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/
+  - title: CockroachDB
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/
   - title: GlusterFS
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/
   - title: Hazelcast

_data/support.yml

@@ -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:

_data/tasks.yml

@@ -1,4 +1,5 @@
 bigheader: "Tasks"
+abstract: "Step-by-step instructions for performing operations with Kuberentes."
 toc:
 - title: Tasks
   path: /docs/tasks/
@@ -8,10 +9,20 @@ toc:
     path: /docs/tasks/configure-pod-container/define-environment-variable-container/
   - title: Defining a Command and Arguments for a Container
     path: /docs/tasks/configure-pod-container/define-command-argument-container/
+  - title: Assigning CPU and RAM Resources to a Container
+    path: /docs/tasks/configure-pod-container/assign-cpu-ram-container/
 - title: Accessing Applications in a Cluster
   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

_data/tools.yml

@@ -1,4 +1,5 @@
 bigheader: "Tools"
+abstract: "Tools to help you use and enhance Kubernetes."
 toc:
 - title: Tools
   path: /docs/tools/

_data/tutorials.yml

@@ -1,4 +1,5 @@
 bigheader: "Tutorials"
+abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
 toc:
 - title: Tutorials
   path: /docs/tutorials/
@@ -50,3 +51,7 @@ toc:
     path: /docs/tutorials/stateless-application/expose-external-ip-address-service/
   - title: Exposing an External IP Address to Access an Application in a Cluster
     path: /docs/tutorials/stateless-application/expose-external-ip-address/
+- title: Stateful Applications
+  section:
+  - title: Running a Single-Instance Stateful Application
+    path: /docs/tutorials/stateful-application/run-stateful-application/