Merge branch 'master' into master

_data/concepts.yml

@@ -7,3 +7,7 @@ toc:
   section:
   - title: Annotations
     path: /docs/concepts/object-metadata/annotations/
+- title: Controllers
+  section:
+  - title: StatefulSets
+    path: /docs/concepts/abstractions/controllers/statefulsets/

_data/guides.yml

@@ -237,6 +237,8 @@ toc:
         path: /docs/getting-started-guides/coreos
       - title: Ubuntu
         path: /docs/getting-started-guides/ubuntu/
+      - title: Windows Server Containers
+        path: /docs/getting-started-guides/windows/
     - title: Validate Node Setup
       path: /docs/admin/node-conformance
   - title: Portable Multi-Node Cluster
@@ -272,8 +274,6 @@ toc:
     path: /docs/admin/cluster-components/
   - title: Configuring Kubernetes Use of etcd
     path: /docs/admin/etcd/
-  - title: Federating Clusters
-    path: /docs/admin/federation/
   - title: Using Multiple Clusters
     path: /docs/admin/multi-cluster/
   - title: Changing Cluster Size
@@ -302,3 +302,10 @@ toc:
     path: /docs/admin/node-problem/
   - title: AppArmor
     path: /docs/admin/apparmor/
+
+- title: Administering Federation
+  section:
+  - title: Using `kubefed`
+    path: /docs/admin/federation/kubfed/
+  - title: Using `federation-up` and `deploy.sh`
+    path: /docs/admin/federation/

_data/reference.yml

@@ -178,7 +178,15 @@ toc:
   - title: kube-scheduler
     path: /docs/admin/kube-scheduler/
   - title: kubelet
-    path: /docs/admin/kubelet/
+    section:
+    - title: Overview 
+      path: /docs/admin/kubelet/
+    - title: Master-Node communication
+      path: /docs/admin/master-node-communication/
+    - title: TLS bootstrapping
+      path: /docs/admin/kubelet-tls-bootstrapping/
+    - title: Kubelet authentication/authorization
+      path: /docs/admin/kubelet-authentication-authorization/ 
 
 - title: Glossary
   section:
@@ -254,6 +262,12 @@ toc:
   section:
   - title: Federation User Guide
     path: /docs/user-guide/federation/
+  - title: Federated ConfigMap
+    path: /docs/user-guide/federation/configmap/
+  - title: Federated DaemonSet
+    path: /docs/user-guide/federation/daemonsets/
+  - title: Federated Deployment
+    path: /docs/user-guide/federation/deployment/
   - title: Federated Events
     path: /docs/user-guide/federation/events/
   - title: Federated Ingress

_data/tasks.yml

@@ -27,8 +27,30 @@ toc:
   section:
   - title: Using an HTTP Proxy to Access the Kubernetes API
     path: /docs/tasks/access-kubernetes-api/http-proxy-access-api/
+
 - title: Administering a Cluster
   section:
   - title: Assigning Pods to Nodes
     path: /docs/tasks/administer-cluster/assign-pods-nodes/
+  - title: Autoscaling the DNS Service in a Cluster
+    path: /docs/tasks/administer-cluster/dns-horizontal-autoscaling/
+  - title: Safely Draining a Node while Respecting Application SLOs
+    path: /docs/tasks/administer-cluster/safely-drain-node/
 
+- title: Managing Stateful Applications
+  section:
+  - title: Upgrading from PetSets to StatefulSets
+    path: /docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/
+  - title: Scaling a StatefulSet
+    path: /docs/tasks/manage-stateful-set/scale-stateful-set/
+  - title: Deleting a Stateful Set
+    path: /docs/tasks/manage-stateful-set/deleting-a-statefulset/
+  - title: Debugging a StatefulSet
+    path: /docs/tasks/manage-stateful-set/debugging-a-statefulset/
+  - title: Force Deleting StatefulSet Pods
+    path: /docs/tasks/manage-stateful-set/delete-pods/
+
+- title: Troubleshooting
+  section:
+  - title: Debugging Init Containers
+    path: /docs/tasks/troubleshoot/debug-init-containers/

_data/tutorials.yml

@@ -53,5 +53,9 @@ toc:
     path: /docs/tutorials/stateless-application/expose-external-ip-address/
 - title: Stateful Applications
   section:
+  - title: StatefulSet Basics
+    path: /docs/tutorials/stateful-application/basic-stateful-set/
   - title: Running a Single-Instance Stateful Application
     path: /docs/tutorials/stateful-application/run-stateful-application/
+  - title: Running a Replicated Stateful Application
+    path: /docs/tutorials/stateful-application/run-replicated-stateful-application/