From bfa604351ff04bd35c4d5af5cb24adae59ef2bf3 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 15 Dec 2016 15:16:54 -0500
Subject: [PATCH 1/9] add explicit titles to docs

---
 docs/admin/accessing-the-api.md                   |  2 +-
 docs/admin/addons.md                              |  1 +
 docs/admin/admission-controllers.md               |  2 +-
 docs/admin/apparmor/index.md                      |  2 +-
 docs/admin/authentication.md                      |  3 ++-
 docs/admin/authorization.md                       |  2 +-
 docs/admin/cluster-components.md                  |  2 +-
 docs/admin/cluster-large.md                       | 15 +++++++--------
 docs/admin/cluster-management.md                  |  2 +-
 docs/admin/cluster-troubleshooting.md             |  2 +-
 docs/admin/daemons.md                             |  2 +-
 docs/admin/dns.md                                 |  2 +-
 docs/admin/etcd.md                                |  3 +--
 docs/admin/federation-apiserver.md                |  2 ++
 docs/admin/federation-controller-manager.md       |  2 ++
 docs/admin/federation/index.md                    |  3 ++-
 docs/admin/garbage-collection.md                  |  2 +-
 docs/admin/high-availability/index.md             |  8 ++++----
 docs/admin/index.md                               |  2 +-
 docs/admin/kube-apiserver.md                      |  2 ++
 docs/admin/kube-controller-manager.md             |  2 ++
 docs/admin/kube-proxy.md                          |  2 ++
 docs/admin/kube-scheduler.md                      |  2 ++
 docs/admin/kubeadm.md                             |  3 +--
 .../admin/kubelet-authentication-authorization.md |  2 +-
 docs/admin/kubelet-tls-bootstrapping.md           |  2 +-
 docs/admin/kubelet.md                             |  2 ++
 docs/admin/limitrange/index.md                    |  2 +-
 docs/admin/master-node-communication.md           |  2 +-
 docs/admin/multi-cluster.md                       |  2 +-
 docs/admin/multiple-schedulers.md                 |  2 +-
 docs/admin/multiple-zones.md                      |  2 +-
 docs/admin/namespaces/index.md                    |  2 +-
 docs/admin/namespaces/walkthrough.md              |  2 +-
 docs/admin/network-plugins.md                     |  2 +-
 docs/admin/networking.md                          |  2 +-
 docs/admin/node-conformance.md                    |  2 +-
 docs/admin/node-problem.md                        |  2 +-
 docs/admin/node.md                                |  2 +-
 docs/admin/out-of-resource.md                     |  2 +-
 docs/admin/ovs-networking.md                      |  2 +-
 docs/admin/resourcequota/index.md                 |  2 +-
 docs/admin/resourcequota/walkthrough.md           |  2 +-
 docs/admin/salt.md                                |  2 +-
 docs/admin/service-accounts-admin.md              |  2 +-
 docs/admin/static-pods.md                         |  2 +-
 .../api-reference/autoscaling/v1/definitions.html |  2 ++
 docs/api-reference/autoscaling/v1/operations.html |  2 ++
 docs/api-reference/batch/v1/definitions.html      |  2 ++
 docs/api-reference/batch/v1/operations.html       |  2 ++
 .../extensions/v1beta1/definitions.html           |  2 ++
 .../extensions/v1beta1/operations.html            |  2 ++
 docs/api-reference/v1/definitions.html            |  2 ++
 docs/api-reference/v1/operations.html             |  2 ++
 docs/api.md                                       |  2 +-
 .../abstractions/controllers/statefulsets.md      |  1 +
 docs/concepts/index.md                            |  1 +
 docs/concepts/object-metadata/annotations.md      |  1 +
 docs/contribute/create-pull-request.md            |  1 +
 docs/contribute/page-templates.md                 |  5 +++--
 docs/contribute/stage-documentation-changes.md    |  1 +
 docs/contribute/style-guide.md                    |  1 +
 docs/contribute/write-new-topic.md                |  1 +
 docs/federation/api-reference/README.md           |  2 ++
 docs/getting-started-guides/alternatives.md       |  1 +
 docs/getting-started-guides/aws.md                |  2 +-
 docs/getting-started-guides/azure.md              |  2 +-
 docs/getting-started-guides/binary_release.md     |  2 +-
 .../centos/centos_manual_config.md                |  2 +-
 docs/getting-started-guides/clc.md                |  3 ++-
 docs/getting-started-guides/cloudstack.md         |  2 +-
 docs/getting-started-guides/coreos/azure/index.md |  1 +
 .../coreos/bare_metal_offline.md                  |  2 +-
 docs/getting-started-guides/coreos/index.md       |  2 +-
 docs/getting-started-guides/dcos.md               |  2 +-
 docs/getting-started-guides/docker-multinode.md   |  1 +
 .../fedora/fedora_ansible_config.md               |  2 +-
 .../fedora/fedora_manual_config.md                |  2 +-
 .../fedora/flannel_multi_node_cluster.md          |  3 ++-
 docs/getting-started-guides/gce.md                |  3 +--
 docs/getting-started-guides/index.md              |  2 +-
 docs/getting-started-guides/kops.md               |  1 +
 docs/getting-started-guides/kubeadm.md            |  2 +-
 docs/getting-started-guides/kubectl.md            |  1 +
 docs/getting-started-guides/libvirt-coreos.md     |  2 +-
 .../logging-elasticsearch.md                      |  2 +-
 docs/getting-started-guides/logging.md            |  2 +-
 docs/getting-started-guides/meanstack.md          |  2 +-
 docs/getting-started-guides/mesos-docker.md       |  3 +--
 docs/getting-started-guides/mesos/index.md        |  2 +-
 docs/getting-started-guides/minikube.md           |  2 +-
 .../network-policy/calico.md                      |  2 +-
 .../network-policy/romana.md                      |  2 +-
 .../network-policy/walkthrough.md                 |  2 +-
 docs/getting-started-guides/openstack-heat.md     |  2 +-
 docs/getting-started-guides/ovirt.md              |  2 +-
 docs/getting-started-guides/photon-controller.md  |  2 +-
 docs/getting-started-guides/rackspace.md          |  2 +-
 docs/getting-started-guides/rkt/index.md          |  2 +-
 docs/getting-started-guides/rkt/notes.md          |  2 +-
 docs/getting-started-guides/scratch.md            |  2 +-
 docs/getting-started-guides/vsphere.md            |  2 +-
 docs/getting-started-guides/windows/index.md      |  2 +-
 docs/hellonode.md                                 |  2 +-
 docs/index.md                                     |  2 +-
 docs/reference.md                                 |  3 ++-
 docs/reporting-security-issues.md                 |  2 +-
 docs/samples.md                                   |  3 ++-
 .../port-forward-access-application-cluster.md    |  1 +
 .../http-proxy-access-api.md                      |  1 +
 .../tasks/administer-cluster/assign-pods-nodes.md |  1 +
 .../dns-horizontal-autoscaling.md                 |  1 +
 .../tasks/administer-cluster/safely-drain-node.md |  4 ++--
 .../assign-cpu-ram-container.md                   |  1 +
 .../configure-volume-storage.md                   |  1 +
 .../define-command-argument-container.md          |  1 +
 .../define-environment-variable-container.md      |  1 +
 .../distribute-credentials-secure.md              |  1 +
 .../determine-reason-pod-failure.md               |  1 +
 docs/tasks/index.md                               |  1 +
 .../debugging-a-statefulset.md                    |  2 +-
 docs/tasks/manage-stateful-set/delete-pods.md     |  2 +-
 .../manage-stateful-set/deleting-a-statefulset.md |  2 +-
 .../manage-stateful-set/scale-stateful-set.md     |  2 +-
 .../upgrade-pet-set-to-stateful-set.md            |  2 +-
 docs/tasks/troubleshoot/debug-init-containers.md  |  2 +-
 docs/tools/index.md                               |  2 +-
 docs/troubleshooting.md                           |  2 +-
 docs/tutorials/index.md                           |  1 +
 .../kubernetes-basics/cluster-interactive.html    |  1 +
 .../kubernetes-basics/cluster-intro.html          |  5 +++--
 .../kubernetes-basics/deploy-interactive.html     |  1 +
 .../tutorials/kubernetes-basics/deploy-intro.html |  1 +
 .../kubernetes-basics/explore-interactive.html    |  1 +
 .../kubernetes-basics/explore-intro.html          |  1 +
 .../kubernetes-basics/expose-interactive.html     |  1 +
 .../tutorials/kubernetes-basics/expose-intro.html |  1 +
 docs/tutorials/kubernetes-basics/index.html       |  1 +
 .../kubernetes-basics/scale-interactive.html      |  1 +
 docs/tutorials/kubernetes-basics/scale-intro.html |  1 +
 .../kubernetes-basics/update-interactive.html     |  1 +
 .../tutorials/kubernetes-basics/update-intro.html |  1 +
 .../stateful-application/basic-stateful-set.md    |  1 +
 .../run-replicated-stateful-application.md        |  2 +-
 .../run-stateful-application.md                   |  1 +
 docs/tutorials/stateful-application/zookeeper.md  |  1 +
 .../expose-external-ip-address-service.md         |  1 +
 .../expose-external-ip-address.md                 |  1 +
 .../run-stateless-application-deployment.md       |  1 +
 docs/user-guide/accessing-the-cluster.md          | 14 +++++++-------
 docs/user-guide/annotations.md                    |  2 +-
 docs/user-guide/application-troubleshooting.md    |  2 +-
 docs/user-guide/compute-resources.md              |  2 +-
 docs/user-guide/config-best-practices.md          |  2 +-
 docs/user-guide/configmap/index.md                |  3 ++-
 docs/user-guide/configuring-containers.md         |  2 +-
 docs/user-guide/connecting-applications.md        |  2 +-
 .../connecting-to-applications-port-forward.md    |  2 +-
 .../connecting-to-applications-proxy.md           |  2 +-
 docs/user-guide/container-environment.md          |  2 +-
 docs/user-guide/containers.md                     |  2 +-
 docs/user-guide/cron-jobs.md                      |  2 +-
 .../debugging-pods-and-replication-controllers.md |  2 +-
 docs/user-guide/debugging-services.md             |  2 +-
 docs/user-guide/deploying-applications.md         |  3 +--
 docs/user-guide/deployments.md                    |  2 +-
 docs/user-guide/docker-cli-to-kubectl.md          |  2 +-
 docs/user-guide/downward-api/index.md             |  2 +-
 docs/user-guide/downward-api/volume/index.md      |  1 +
 docs/user-guide/environment-guide/index.md        | 12 ++++++------
 docs/user-guide/federation/configmap.md           |  1 +
 docs/user-guide/federation/daemonsets.md          |  1 +
 docs/user-guide/federation/deployment.md          |  1 +
 docs/user-guide/federation/events.md              |  1 +
 docs/user-guide/federation/federated-ingress.md   |  1 +
 docs/user-guide/federation/federated-services.md  |  2 +-
 docs/user-guide/federation/index.md               |  1 +
 docs/user-guide/federation/namespaces.md          |  1 +
 docs/user-guide/federation/replicasets.md         |  1 +
 docs/user-guide/federation/secrets.md             |  1 +
 docs/user-guide/garbage-collection.md             |  2 +-
 docs/user-guide/getting-into-containers.md        |  2 +-
 .../horizontal-pod-autoscaling/index.md           |  2 +-
 .../horizontal-pod-autoscaling/walkthrough.md     |  2 +-
 docs/user-guide/identifiers.md                    |  2 +-
 docs/user-guide/images.md                         |  2 +-
 docs/user-guide/index.md                          |  2 +-
 docs/user-guide/ingress.md                        |  2 +-
 docs/user-guide/introspection-and-debugging.md    |  2 +-
 docs/user-guide/jobs.md                           |  2 +-
 docs/user-guide/jobs/expansions/index.md          |  1 +
 docs/user-guide/jobs/work-queue-1/index.md        |  1 +
 docs/user-guide/jobs/work-queue-2/index.md        |  1 +
 docs/user-guide/jsonpath.md                       |  2 +-
 docs/user-guide/kubeconfig-file.md                | 14 +++++++-------
 docs/user-guide/kubectl-cheatsheet.md             |  2 +-
 docs/user-guide/kubectl-conventions.md            |  2 +-
 docs/user-guide/kubectl-overview.md               |  2 +-
 docs/user-guide/kubectl/index.md                  |  2 ++
 docs/user-guide/kubectl/kubectl_annotate.md       |  2 ++
 docs/user-guide/kubectl/kubectl_api-versions.md   |  2 ++
 docs/user-guide/kubectl/kubectl_apply.md          |  2 ++
 docs/user-guide/kubectl/kubectl_attach.md         |  2 ++
 docs/user-guide/kubectl/kubectl_autoscale.md      |  2 ++
 docs/user-guide/kubectl/kubectl_cluster-info.md   |  2 ++
 docs/user-guide/kubectl/kubectl_config.md         |  2 ++
 .../kubectl/kubectl_config_current-context.md     |  2 ++
 .../kubectl/kubectl_config_set-cluster.md         |  2 ++
 .../kubectl/kubectl_config_set-context.md         |  2 ++
 .../kubectl/kubectl_config_set-credentials.md     |  2 ++
 docs/user-guide/kubectl/kubectl_config_set.md     |  2 ++
 docs/user-guide/kubectl/kubectl_config_unset.md   |  2 ++
 .../kubectl/kubectl_config_use-context.md         |  2 ++
 docs/user-guide/kubectl/kubectl_config_view.md    |  2 ++
 docs/user-guide/kubectl/kubectl_convert.md        |  2 ++
 docs/user-guide/kubectl/kubectl_cordon.md         |  2 ++
 docs/user-guide/kubectl/kubectl_create.md         |  2 ++
 .../kubectl/kubectl_create_configmap.md           |  2 ++
 .../kubectl/kubectl_create_namespace.md           |  2 ++
 docs/user-guide/kubectl/kubectl_create_secret.md  |  2 ++
 .../kubectl_create_secret_docker-registry.md      |  2 ++
 .../kubectl/kubectl_create_secret_generic.md      |  2 ++
 .../kubectl/kubectl_create_serviceaccount.md      |  2 ++
 docs/user-guide/kubectl/kubectl_delete.md         |  2 ++
 docs/user-guide/kubectl/kubectl_describe.md       |  2 ++
 docs/user-guide/kubectl/kubectl_drain.md          |  2 ++
 docs/user-guide/kubectl/kubectl_edit.md           |  2 ++
 docs/user-guide/kubectl/kubectl_exec.md           |  2 ++
 docs/user-guide/kubectl/kubectl_explain.md        |  2 ++
 docs/user-guide/kubectl/kubectl_expose.md         |  2 ++
 docs/user-guide/kubectl/kubectl_get.md            |  2 ++
 docs/user-guide/kubectl/kubectl_label.md          |  2 ++
 docs/user-guide/kubectl/kubectl_logs.md           |  2 ++
 docs/user-guide/kubectl/kubectl_patch.md          |  2 ++
 docs/user-guide/kubectl/kubectl_port-forward.md   |  2 ++
 docs/user-guide/kubectl/kubectl_proxy.md          |  2 ++
 docs/user-guide/kubectl/kubectl_replace.md        |  2 ++
 docs/user-guide/kubectl/kubectl_rolling-update.md |  2 ++
 docs/user-guide/kubectl/kubectl_rollout.md        |  2 ++
 .../user-guide/kubectl/kubectl_rollout_history.md |  2 ++
 docs/user-guide/kubectl/kubectl_rollout_pause.md  |  2 ++
 docs/user-guide/kubectl/kubectl_rollout_resume.md |  2 ++
 docs/user-guide/kubectl/kubectl_rollout_undo.md   |  2 ++
 docs/user-guide/kubectl/kubectl_run.md            |  2 ++
 docs/user-guide/kubectl/kubectl_scale.md          |  2 ++
 docs/user-guide/kubectl/kubectl_stop.md           |  2 ++
 docs/user-guide/kubectl/kubectl_uncordon.md       |  2 ++
 docs/user-guide/kubectl/kubectl_version.md        |  2 ++
 docs/user-guide/labels.md                         |  2 +-
 docs/user-guide/liveness/index.md                 |  2 +-
 docs/user-guide/load-balancer.md                  |  2 +-
 docs/user-guide/logging.md                        |  2 +-
 docs/user-guide/managing-deployments.md           |  3 ++-
 docs/user-guide/monitoring.md                     |  2 +-
 docs/user-guide/namespaces.md                     |  2 +-
 docs/user-guide/networkpolicies.md                |  2 +-
 docs/user-guide/node-selection/index.md           |  2 +-
 docs/user-guide/persistent-volumes/index.md       |  2 +-
 docs/user-guide/persistent-volumes/walkthrough.md |  2 +-
 docs/user-guide/petset.md                         |  2 +-
 docs/user-guide/petset/bootstrapping/index.md     |  1 +
 docs/user-guide/pod-security-policy/index.md      |  2 +-
 docs/user-guide/pod-states.md                     |  2 +-
 docs/user-guide/pods/index.md                     |  4 ++--
 docs/user-guide/pods/multi-container.md           |  2 +-
 docs/user-guide/pods/single-container.md          |  2 +-
 docs/user-guide/prereqs.md                        |  2 +-
 docs/user-guide/production-pods.md                |  2 +-
 docs/user-guide/quick-start.md                    |  2 +-
 docs/user-guide/replicasets.md                    |  2 +-
 docs/user-guide/replication-controller/index.md   |  2 +-
 .../replication-controller/operations.md          |  3 ++-
 .../resizing-a-replication-controller.md          |  2 +-
 docs/user-guide/rolling-updates.md                |  2 +-
 docs/user-guide/secrets/index.md                  |  2 +-
 docs/user-guide/secrets/walkthrough.md            |  4 ++--
 docs/user-guide/security-context.md               |  2 +-
 docs/user-guide/service-accounts.md               |  2 +-
 docs/user-guide/services-firewalls.md             |  2 +-
 docs/user-guide/services/index.md                 |  2 +-
 docs/user-guide/services/operations.md            |  3 ++-
 docs/user-guide/sharing-clusters.md               |  2 +-
 docs/user-guide/simple-nginx.md                   |  2 +-
 docs/user-guide/thirdpartyresources.md            |  2 +-
 docs/user-guide/ui.md                             |  3 +--
 docs/user-guide/update-demo/index.md              | 15 +++++++--------
 docs/user-guide/volumes.md                        |  2 +-
 docs/user-guide/working-with-resources.md         |  2 +-
 docs/whatisk8s.md                                 |  3 +--
 editdocs.md                                       |  1 +
 kubernetes/third_party/swagger-ui/index.md        |  4 ++++
 291 files changed, 409 insertions(+), 212 deletions(-)

diff --git a/docs/admin/accessing-the-api.md b/docs/admin/accessing-the-api.md
index cb3f3d4ce4..0e491ccf0d 100644
--- a/docs/admin/accessing-the-api.md
+++ b/docs/admin/accessing-the-api.md
@@ -3,7 +3,7 @@ assignees:
 - bgrant0607
 - erictune
 - lavalamp
-
+title: Overview
 ---
 
 This document describes how access to the Kubernetes API is controlled.
diff --git a/docs/admin/addons.md b/docs/admin/addons.md
index 1555f8263c..d387c972b6 100644
--- a/docs/admin/addons.md
+++ b/docs/admin/addons.md
@@ -1,4 +1,5 @@
 ---
+title: Installing Addons
 ---
 
 ## Overview
diff --git a/docs/admin/admission-controllers.md b/docs/admin/admission-controllers.md
index 24da796163..475f2e4be9 100644
--- a/docs/admin/admission-controllers.md
+++ b/docs/admin/admission-controllers.md
@@ -6,7 +6,7 @@ assignees:
 - erictune
 - janetkuo
 - thockin
-
+title: Using Admission Controllers
 ---
 
 * TOC
diff --git a/docs/admin/apparmor/index.md b/docs/admin/apparmor/index.md
index 9730c07953..4c2d02d989 100644
--- a/docs/admin/apparmor/index.md
+++ b/docs/admin/apparmor/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - stclair
-
+title: AppArmor
 ---
 
 AppArmor is a Linux kernel enhancement that can reduce the potential attack surface of an
diff --git a/docs/admin/authentication.md b/docs/admin/authentication.md
index 0cb5ea4dbe..ab41a6fd39 100644
--- a/docs/admin/authentication.md
+++ b/docs/admin/authentication.md
@@ -5,8 +5,9 @@ assignees:
 - ericchiang
 - deads2k
 - liggitt
-
+title: Authenticating
 ---
+
 * TOC
 {:toc}
 
diff --git a/docs/admin/authorization.md b/docs/admin/authorization.md
index f1f46985b2..6f76a1c033 100644
--- a/docs/admin/authorization.md
+++ b/docs/admin/authorization.md
@@ -4,7 +4,7 @@ assignees:
 - lavalamp
 - deads2k
 - liggitt
-
+title: Using Authorization Plugins
 ---
 
 In Kubernetes, authorization happens as a separate step from authentication.
diff --git a/docs/admin/cluster-components.md b/docs/admin/cluster-components.md
index c1bcae8577..0b913d8956 100644
--- a/docs/admin/cluster-components.md
+++ b/docs/admin/cluster-components.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - lavalamp
-
+title: Kubernetes Components
 ---
 
 This document outlines the various binary components that need to run to
diff --git a/docs/admin/cluster-large.md b/docs/admin/cluster-large.md
index d2285c3346..f41df12689 100644
--- a/docs/admin/cluster-large.md
+++ b/docs/admin/cluster-large.md
@@ -1,11 +1,10 @@
----
-assignees:
-- davidopp
-- lavalamp
-
----
-
-
+---
+assignees:
+- davidopp
+- lavalamp
+title: Building Large Clusters
+---
+
 ## Support
 
 At {{page.version}}, Kubernetes supports clusters with up to 1000 nodes. More specifically, we support configurations that meet *all* of the following criteria:
diff --git a/docs/admin/cluster-management.md b/docs/admin/cluster-management.md
index 97362c4bab..b1c4c340a3 100644
--- a/docs/admin/cluster-management.md
+++ b/docs/admin/cluster-management.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - thockin
-
+title: Cluster Management Guide
 ---
 
 * TOC
diff --git a/docs/admin/cluster-troubleshooting.md b/docs/admin/cluster-troubleshooting.md
index 8bab089ce6..89cd99926b 100644
--- a/docs/admin/cluster-troubleshooting.md
+++ b/docs/admin/cluster-troubleshooting.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - davidopp
-
+title: Troubleshooting Clusters
 ---
 
 This doc is about cluster troubleshooting; we assume you have already ruled out your application as the root cause of the
diff --git a/docs/admin/daemons.md b/docs/admin/daemons.md
index bab12268ba..fd2bc8afcb 100644
--- a/docs/admin/daemons.md
+++ b/docs/admin/daemons.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - erictune
-
+title: Daemon Sets
 ---
 
 * TOC
diff --git a/docs/admin/dns.md b/docs/admin/dns.md
index 6115be7363..6ed558859b 100644
--- a/docs/admin/dns.md
+++ b/docs/admin/dns.md
@@ -3,7 +3,7 @@ assignees:
 - ArtfulCoder
 - davidopp
 - lavalamp
-
+title: Using DNS Pods and Services
 ---
 
 ## Introduction
diff --git a/docs/admin/etcd.md b/docs/admin/etcd.md
index 14b36a33be..ea4f6b09b3 100644
--- a/docs/admin/etcd.md
+++ b/docs/admin/etcd.md
@@ -1,10 +1,9 @@
 ---
 assignees:
 - lavalamp
-
+title: Configuring Kubernetes Use of etcd
 ---
 
-
 [etcd](https://coreos.com/etcd/docs/2.2.1/) is a highly-available key value
 store which Kubernetes uses for persistent storage of all of its REST API
 objects.
diff --git a/docs/admin/federation-apiserver.md b/docs/admin/federation-apiserver.md
index 9236c62d38..77b066854c 100644
--- a/docs/admin/federation-apiserver.md
+++ b/docs/admin/federation-apiserver.md
@@ -1,5 +1,7 @@
 ---
+title: federation-apiserver
 ---
+
 ## federation-apiserver
 
 
diff --git a/docs/admin/federation-controller-manager.md b/docs/admin/federation-controller-manager.md
index a65bbef5f3..5e87fce3d0 100644
--- a/docs/admin/federation-controller-manager.md
+++ b/docs/admin/federation-controller-manager.md
@@ -1,5 +1,7 @@
 ---
+title: federation-controller-mananger
 ---
+
 ## federation-controller-manager
 
 
diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md
index ec40d581bb..478f7563de 100644
--- a/docs/admin/federation/index.md
+++ b/docs/admin/federation/index.md
@@ -3,8 +3,9 @@ assignees:
 - madhusudancs
 - mml
 - nikhiljindal
-
+title: Using `federation-up` and `deploy.sh`
 ---
+
 This guide explains how to set up cluster federation that lets us control multiple Kubernetes clusters.
 
 
diff --git a/docs/admin/garbage-collection.md b/docs/admin/garbage-collection.md
index a3112a07f1..0276596f6c 100644
--- a/docs/admin/garbage-collection.md
+++ b/docs/admin/garbage-collection.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Configuring kubelet Garbage Collection
 ---
 
 * TOC
diff --git a/docs/admin/high-availability/index.md b/docs/admin/high-availability/index.md
index ad78270e4a..42e51d3d51 100644
--- a/docs/admin/high-availability/index.md
+++ b/docs/admin/high-availability/index.md
@@ -1,7 +1,7 @@
----
-
----
-
+---
+title: Building High-Availability Clusters
+---
+
 ## Introduction
 
 This document describes how to build a high-availability (HA) Kubernetes cluster.  This is a fairly advanced topic.
diff --git a/docs/admin/index.md b/docs/admin/index.md
index 3624bb4202..98f38b428a 100644
--- a/docs/admin/index.md
+++ b/docs/admin/index.md
@@ -2,7 +2,7 @@
 assignees:
 - davidopp
 - lavalamp
-
+title: Admin Guide
 ---
 
 The cluster admin guide is for anyone creating or administering a Kubernetes cluster.
diff --git a/docs/admin/kube-apiserver.md b/docs/admin/kube-apiserver.md
index 12d2b76a49..e8142fac4e 100644
--- a/docs/admin/kube-apiserver.md
+++ b/docs/admin/kube-apiserver.md
@@ -1,5 +1,7 @@
 ---
+title: kube-apiserver
 ---
+
 ## kube-apiserver
 
 
diff --git a/docs/admin/kube-controller-manager.md b/docs/admin/kube-controller-manager.md
index 68cca731e7..5dab0da7e2 100644
--- a/docs/admin/kube-controller-manager.md
+++ b/docs/admin/kube-controller-manager.md
@@ -1,5 +1,7 @@
 ---
+title: kube-controller-manager
 ---
+
 ## kube-controller-manager
 
 
diff --git a/docs/admin/kube-proxy.md b/docs/admin/kube-proxy.md
index 491a91d06e..f643748624 100644
--- a/docs/admin/kube-proxy.md
+++ b/docs/admin/kube-proxy.md
@@ -1,5 +1,7 @@
 ---
+title: kube-proxy
 ---
+
 ## kube-proxy
 
 
diff --git a/docs/admin/kube-scheduler.md b/docs/admin/kube-scheduler.md
index 9b4d7264e6..bb6799bb73 100644
--- a/docs/admin/kube-scheduler.md
+++ b/docs/admin/kube-scheduler.md
@@ -1,5 +1,7 @@
 ---
+title: kube-scheduler
 ---
+
 ## kube-scheduler
 
 
diff --git a/docs/admin/kubeadm.md b/docs/admin/kubeadm.md
index e1c8537149..3dc59fd2d6 100644
--- a/docs/admin/kubeadm.md
+++ b/docs/admin/kubeadm.md
@@ -4,10 +4,9 @@ assignees:
 - luxas
 - errordeveloper
 - jbeda
-
+title: kubeadm reference
 ---
 
-
 This document provides information on how to use kubeadm's advanced options.
 
 Running `kubeadm init` bootstraps a Kubernetes cluster. This consists of the
diff --git a/docs/admin/kubelet-authentication-authorization.md b/docs/admin/kubelet-authentication-authorization.md
index b0617b8854..035f3068fa 100644
--- a/docs/admin/kubelet-authentication-authorization.md
+++ b/docs/admin/kubelet-authentication-authorization.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - liggitt
-
+title: Kubelet authentication/authorization
 ---
 
 * TOC
diff --git a/docs/admin/kubelet-tls-bootstrapping.md b/docs/admin/kubelet-tls-bootstrapping.md
index 3458bdb310..f8d56923ee 100644
--- a/docs/admin/kubelet-tls-bootstrapping.md
+++ b/docs/admin/kubelet-tls-bootstrapping.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: TLS bootstrapping
 ---
 
 * TOC
diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md
index a3004ea1aa..74186eb1ba 100644
--- a/docs/admin/kubelet.md
+++ b/docs/admin/kubelet.md
@@ -1,5 +1,7 @@
 ---
+title: Overview
 ---
+
 ## kubelet
 
 
diff --git a/docs/admin/limitrange/index.md b/docs/admin/limitrange/index.md
index 0336264bc3..767513a1a3 100644
--- a/docs/admin/limitrange/index.md
+++ b/docs/admin/limitrange/index.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-
+title: Setting Pod CPU and Memory Limits
 ---
 
 By default, pods run with unbounded CPU and memory limits.  This means that any pod in the
diff --git a/docs/admin/master-node-communication.md b/docs/admin/master-node-communication.md
index 9e8b9cfa9e..91ecff7ef9 100644
--- a/docs/admin/master-node-communication.md
+++ b/docs/admin/master-node-communication.md
@@ -3,7 +3,7 @@ assignees:
 - dchen1107
 - roberthbailey
 - liggitt
-
+title: Master-Node communication
 ---
 
 * TOC
diff --git a/docs/admin/multi-cluster.md b/docs/admin/multi-cluster.md
index 6359782409..1d238d8e13 100644
--- a/docs/admin/multi-cluster.md
+++ b/docs/admin/multi-cluster.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - davidopp
-
+title: Using Multiple Clusters
 ---
 
 You may want to set up multiple Kubernetes clusters, both to
diff --git a/docs/admin/multiple-schedulers.md b/docs/admin/multiple-schedulers.md
index 8ba152ac04..eb1c4c44f9 100644
--- a/docs/admin/multiple-schedulers.md
+++ b/docs/admin/multiple-schedulers.md
@@ -2,7 +2,7 @@
 assignees:
 - davidopp
 - madhusudancs
-
+title: Configuring Multiple Schedulers
 ---
 
 Kubernetes ships with a default scheduler that is described [here](/docs/admin/kube-scheduler/).
diff --git a/docs/admin/multiple-zones.md b/docs/admin/multiple-zones.md
index bfde54213e..e215b31716 100644
--- a/docs/admin/multiple-zones.md
+++ b/docs/admin/multiple-zones.md
@@ -3,7 +3,7 @@ assignees:
 - jlowdermilk
 - justinsb
 - quinton-hoole
-
+title: Running in Multiple Zones
 ---
 
 ## Introduction
diff --git a/docs/admin/namespaces/index.md b/docs/admin/namespaces/index.md
index 574f41b10a..b723a9c361 100644
--- a/docs/admin/namespaces/index.md
+++ b/docs/admin/namespaces/index.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-
+title: Sharing a Cluster with Namespaces
 ---
 
 A Namespace is a mechanism to partition resources created by users into
diff --git a/docs/admin/namespaces/walkthrough.md b/docs/admin/namespaces/walkthrough.md
index 2a3e6298ea..9faecf89e9 100644
--- a/docs/admin/namespaces/walkthrough.md
+++ b/docs/admin/namespaces/walkthrough.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-
+title: Namespaces Walkthrough
 ---
 
 Kubernetes _namespaces_ help different projects, teams, or customers to share a Kubernetes cluster.
diff --git a/docs/admin/network-plugins.md b/docs/admin/network-plugins.md
index 6c5f354423..6b80f1a002 100644
--- a/docs/admin/network-plugins.md
+++ b/docs/admin/network-plugins.md
@@ -3,7 +3,7 @@ assignees:
 - dcbw
 - freehan
 - thockin
-
+title: Network Plugins
 ---
 
 * TOC
diff --git a/docs/admin/networking.md b/docs/admin/networking.md
index 9b77b3557a..231b7b315d 100644
--- a/docs/admin/networking.md
+++ b/docs/admin/networking.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - thockin
-
+title: Networking in Kubernetes
 ---
 
 Kubernetes approaches networking somewhat differently than Docker does by
diff --git a/docs/admin/node-conformance.md b/docs/admin/node-conformance.md
index 52935bc4cc..f53ba858b1 100644
--- a/docs/admin/node-conformance.md
+++ b/docs/admin/node-conformance.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - Random-Liu
-
+title: Validate Node Setup
 ---
 
 * TOC
diff --git a/docs/admin/node-problem.md b/docs/admin/node-problem.md
index b6926ba15b..0d7b57005e 100644
--- a/docs/admin/node-problem.md
+++ b/docs/admin/node-problem.md
@@ -2,7 +2,7 @@
 assignees:
 - Random-Liu
 - dchen1107
-
+title: Monitoring Node Health
 ---
 
 * TOC
diff --git a/docs/admin/node.md b/docs/admin/node.md
index ad0867ffc8..3c3e16178d 100644
--- a/docs/admin/node.md
+++ b/docs/admin/node.md
@@ -3,7 +3,7 @@ assignees:
 - caesarxuchao
 - dchen1107
 - lavalamp
-
+title: Nodes
 ---
 
 * TOC
diff --git a/docs/admin/out-of-resource.md b/docs/admin/out-of-resource.md
index 8af7114ed6..a663703d9c 100644
--- a/docs/admin/out-of-resource.md
+++ b/docs/admin/out-of-resource.md
@@ -3,7 +3,7 @@ assignees:
 - derekwaynecarr
 - vishh
 - timstclair
-
+title: Configuring Out Of Resource Handling
 ---
 
 * TOC
diff --git a/docs/admin/ovs-networking.md b/docs/admin/ovs-networking.md
index 7a8f89506c..9370dcec46 100644
--- a/docs/admin/ovs-networking.md
+++ b/docs/admin/ovs-networking.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - thockin
-
+title: Kubernetes OpenVSwitch GRE/VxLAN networking
 ---
 
 This document describes how OpenVSwitch is used to setup networking between pods across nodes.
diff --git a/docs/admin/resourcequota/index.md b/docs/admin/resourcequota/index.md
index ff76942702..c967975dec 100644
--- a/docs/admin/resourcequota/index.md
+++ b/docs/admin/resourcequota/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - derekwaynecarr
-
+title: Resource Quotas
 ---
 
 When several users or teams share a cluster with a fixed number of nodes,
diff --git a/docs/admin/resourcequota/walkthrough.md b/docs/admin/resourcequota/walkthrough.md
index 7422f2abcf..d5ef21ff6c 100644
--- a/docs/admin/resourcequota/walkthrough.md
+++ b/docs/admin/resourcequota/walkthrough.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-
+title: Applying Resource Quotas and Limits
 ---
 
 This example demonstrates a typical setup to control for resource usage in a namespace.
diff --git a/docs/admin/salt.md b/docs/admin/salt.md
index 5d82b54d39..ba4d4fe227 100644
--- a/docs/admin/salt.md
+++ b/docs/admin/salt.md
@@ -2,7 +2,7 @@
 assignees:
 - davidopp
 - lavalamp
-
+title: Configuring Kubernetes with Salt
 ---
 
 The Kubernetes cluster can be configured using Salt.
diff --git a/docs/admin/service-accounts-admin.md b/docs/admin/service-accounts-admin.md
index 810f4d7515..4a31fbeced 100644
--- a/docs/admin/service-accounts-admin.md
+++ b/docs/admin/service-accounts-admin.md
@@ -4,7 +4,7 @@ assignees:
 - davidopp
 - lavalamp
 - liggitt
-
+title: Managing Service Accounts
 ---
 
 *This is a Cluster Administrator guide to service accounts.  It assumes knowledge of
diff --git a/docs/admin/static-pods.md b/docs/admin/static-pods.md
index 531494fb04..36235929a3 100644
--- a/docs/admin/static-pods.md
+++ b/docs/admin/static-pods.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - jsafrane
-
+title: Static Pods
 ---
 
 **If you are running clustered Kubernetes and are using static pods to run a pod on every node, you should probably be using a [DaemonSet](/docs/admin/daemons/)!**
diff --git a/docs/api-reference/autoscaling/v1/definitions.html b/docs/api-reference/autoscaling/v1/definitions.html
index 949fa2e507..768d4e1543 100755
--- a/docs/api-reference/autoscaling/v1/definitions.html
+++ b/docs/api-reference/autoscaling/v1/definitions.html
@@ -1,5 +1,7 @@
 ---
+title: Autoscaling API Definitions
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/autoscaling/v1/operations.html b/docs/api-reference/autoscaling/v1/operations.html
index 0e38da7627..cfc457d1e5 100755
--- a/docs/api-reference/autoscaling/v1/operations.html
+++ b/docs/api-reference/autoscaling/v1/operations.html
@@ -1,5 +1,7 @@
 ---
+title: Autoscaling API Operations
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html
index be391e4acd..9989f4c4ca 100755
--- a/docs/api-reference/batch/v1/definitions.html
+++ b/docs/api-reference/batch/v1/definitions.html
@@ -1,5 +1,7 @@
 ---
+title: Batch API Definitions
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/batch/v1/operations.html b/docs/api-reference/batch/v1/operations.html
index 691318f810..5be3ce0b60 100755
--- a/docs/api-reference/batch/v1/operations.html
+++ b/docs/api-reference/batch/v1/operations.html
@@ -1,5 +1,7 @@
 ---
+title: Batch API Operations
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html
index 3863ee11f8..b92378524f 100755
--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@@ -1,5 +1,7 @@
 ---
+title: Extensions API Definitions
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html
index c1d9c191ec..a97f64b789 100755
--- a/docs/api-reference/extensions/v1beta1/operations.html
+++ b/docs/api-reference/extensions/v1beta1/operations.html
@@ -1,5 +1,7 @@
 ---
+title: Extensions API Operations
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html
index 6c2515eeaa..e207f68c0a 100755
--- a/docs/api-reference/v1/definitions.html
+++ b/docs/api-reference/v1/definitions.html
@@ -1,5 +1,7 @@
 ---
+title: Kubernetes API Definitions
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api-reference/v1/operations.html b/docs/api-reference/v1/operations.html
index dfdb663b8b..f75e9a44f5 100755
--- a/docs/api-reference/v1/operations.html
+++ b/docs/api-reference/v1/operations.html
@@ -1,5 +1,7 @@
 ---
+title: Kubernetes API Operations
 ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/docs/api.md b/docs/api.md
index 3479dbff94..7964f604d0 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -3,7 +3,7 @@ assignees:
 - bgrant0607
 - erictune
 - lavalamp
-
+title: Kubernetes API Overview
 ---
 
 Primary system and API concepts are documented in the [User guide](/docs/user-guide/).
diff --git a/docs/concepts/abstractions/controllers/statefulsets.md b/docs/concepts/abstractions/controllers/statefulsets.md
index 01825fc257..6f8e9629c3 100644
--- a/docs/concepts/abstractions/controllers/statefulsets.md
+++ b/docs/concepts/abstractions/controllers/statefulsets.md
@@ -7,6 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
+title: StatefulSets
 ---
 
 {% capture overview %}
diff --git a/docs/concepts/index.md b/docs/concepts/index.md
index 72d1ecebb2..c26b972202 100644
--- a/docs/concepts/index.md
+++ b/docs/concepts/index.md
@@ -1,4 +1,5 @@
 ---
+title: Concepts
 ---
 
 The Concepts section of the Kubernetes documentation is a work in progress.
diff --git a/docs/concepts/object-metadata/annotations.md b/docs/concepts/object-metadata/annotations.md
index e337493fe1..fbf73f48fd 100644
--- a/docs/concepts/object-metadata/annotations.md
+++ b/docs/concepts/object-metadata/annotations.md
@@ -1,4 +1,5 @@
 ---
+title: Annotations
 ---
 
 {% capture overview %}
diff --git a/docs/contribute/create-pull-request.md b/docs/contribute/create-pull-request.md
index e74b49436e..4637c0b066 100644
--- a/docs/contribute/create-pull-request.md
+++ b/docs/contribute/create-pull-request.md
@@ -1,4 +1,5 @@
 ---
+title: Creating a Documentation Pull Request
 ---
 
 {% capture overview %}
diff --git a/docs/contribute/page-templates.md b/docs/contribute/page-templates.md
index 4b19cde39b..93fa03a6bb 100644
--- a/docs/contribute/page-templates.md
+++ b/docs/contribute/page-templates.md
@@ -1,7 +1,8 @@
 ---
 redirect_from:
-  - /docs/templatedemos/
-  - /docs/templatedemos.html
+- "/docs/templatedemos/"
+- "/docs/templatedemos.html"
+title: Using Page Templates
 ---
 
 <!--<html>
diff --git a/docs/contribute/stage-documentation-changes.md b/docs/contribute/stage-documentation-changes.md
index 56177a3e3f..50e22a1b8b 100644
--- a/docs/contribute/stage-documentation-changes.md
+++ b/docs/contribute/stage-documentation-changes.md
@@ -1,4 +1,5 @@
 ---
+title: Staging Your Documentation Changes
 ---
 
 {% capture overview %}
diff --git a/docs/contribute/style-guide.md b/docs/contribute/style-guide.md
index 9d65dbda9a..47d3cd75c0 100644
--- a/docs/contribute/style-guide.md
+++ b/docs/contribute/style-guide.md
@@ -1,4 +1,5 @@
 ---
+title: Documentation Style Guide
 ---
 
 {% capture overview %}
diff --git a/docs/contribute/write-new-topic.md b/docs/contribute/write-new-topic.md
index 9941ef5082..7d417a1097 100644
--- a/docs/contribute/write-new-topic.md
+++ b/docs/contribute/write-new-topic.md
@@ -1,4 +1,5 @@
 ---
+title: Writing a New Topic
 ---
 
 {% capture overview %}
diff --git a/docs/federation/api-reference/README.md b/docs/federation/api-reference/README.md
index 7386d3bde7..036ffdc53c 100644
--- a/docs/federation/api-reference/README.md
+++ b/docs/federation/api-reference/README.md
@@ -1,5 +1,7 @@
 ---
+title: Federation API
 ---
+
 # API Reference
 
 Federation API server supports the following group versions:
diff --git a/docs/getting-started-guides/alternatives.md b/docs/getting-started-guides/alternatives.md
index b235ea0bdd..26d48c9c76 100644
--- a/docs/getting-started-guides/alternatives.md
+++ b/docs/getting-started-guides/alternatives.md
@@ -1,6 +1,7 @@
 ---
 assignees:
 - pwittrock
+title: Deprecated Alternatives
 ---
 
 # *Stop.  These guides are superseded by [Minikube](../minikube/).  They are only listed here for completeness.*
diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md
index a76cfeeeea..214cb00145 100644
--- a/docs/getting-started-guides/aws.md
+++ b/docs/getting-started-guides/aws.md
@@ -3,7 +3,7 @@ assignees:
 - justinsb
 - lavalamp
 - clove
-
+title: Running Kubernetes on AWS EC2
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/azure.md b/docs/getting-started-guides/azure.md
index 40652e3172..3fce9b8471 100644
--- a/docs/getting-started-guides/azure.md
+++ b/docs/getting-started-guides/azure.md
@@ -2,7 +2,7 @@
 assignees:
 - colemickens
 - jeffmendoza
-
+title: Running Kubernetes on Azure
 ---
 
 The recommended approach for deploying a Kubernetes 1.4 cluster on Azure is the
diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md
index cd9695a2c9..6b12c75e1d 100644
--- a/docs/getting-started-guides/binary_release.md
+++ b/docs/getting-started-guides/binary_release.md
@@ -2,7 +2,7 @@
 assignees:
 - david-mcmahon
 - jbeda
-
+title: Downloading or Building Kubernetes
 ---
 
 You can either build a release from sources or download a pre-built release.  If you do not plan on developing Kubernetes itself, we suggest a pre-built release. 
diff --git a/docs/getting-started-guides/centos/centos_manual_config.md b/docs/getting-started-guides/centos/centos_manual_config.md
index 08419bcff7..79311db5ba 100644
--- a/docs/getting-started-guides/centos/centos_manual_config.md
+++ b/docs/getting-started-guides/centos/centos_manual_config.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - thockin
-
+title: CentOS
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/clc.md b/docs/getting-started-guides/clc.md
index 8ec4a3281a..ab45ffbf8f 100644
--- a/docs/getting-started-guides/clc.md
+++ b/docs/getting-started-guides/clc.md
@@ -1,6 +1,7 @@
 ---
+title: Running Kubernetes on CenturyLink Cloud
+---
 
----
 * TOC
 {: toc}
 
diff --git a/docs/getting-started-guides/cloudstack.md b/docs/getting-started-guides/cloudstack.md
index ac79275007..e19aa55413 100644
--- a/docs/getting-started-guides/cloudstack.md
+++ b/docs/getting-started-guides/cloudstack.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - thockin
-
+title: Cloudstack
 ---
 
 CloudStack is a software to build public and private clouds based on hardware virtualization principles (traditional IaaS). To deploy Kubernetes on CloudStack there are several possibilities depending on the Cloud being used and what images are made available. [Exoscale](http://exoscale.ch) for instance makes a [CoreOS](http://coreos.com) template available, therefore instructions to deploy Kubernetes on coreOS can be used. CloudStack also has a vagrant plugin available, hence Vagrant could be used to deploy Kubernetes either using the existing shell provisioner or using new Salt based recipes.
diff --git a/docs/getting-started-guides/coreos/azure/index.md b/docs/getting-started-guides/coreos/azure/index.md
index 589cf81fcc..96642644ff 100644
--- a/docs/getting-started-guides/coreos/azure/index.md
+++ b/docs/getting-started-guides/coreos/azure/index.md
@@ -1,4 +1,5 @@
 ---
+title: Running Kubernetes on Azure (Weave-based)
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/coreos/bare_metal_offline.md b/docs/getting-started-guides/coreos/bare_metal_offline.md
index cf62fe3439..3e9bce3148 100644
--- a/docs/getting-started-guides/coreos/bare_metal_offline.md
+++ b/docs/getting-started-guides/coreos/bare_metal_offline.md
@@ -2,7 +2,7 @@
 assignees:
 - erictune
 - thockin
-
+title: Offline
 ---
 
 Deploy a CoreOS running Kubernetes environment. This particular guide is made to help those in an OFFLINE system, wither for testing a POC before the real deal, or you are restricted to be totally offline for your applications.
diff --git a/docs/getting-started-guides/coreos/index.md b/docs/getting-started-guides/coreos/index.md
index 80199a61c0..e57d2d2d85 100644
--- a/docs/getting-started-guides/coreos/index.md
+++ b/docs/getting-started-guides/coreos/index.md
@@ -1,5 +1,5 @@
 ---
-
+title: CoreOS on AWS or GCE
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/dcos.md b/docs/getting-started-guides/dcos.md
index 43c6d28e36..d99f2d332e 100644
--- a/docs/getting-started-guides/dcos.md
+++ b/docs/getting-started-guides/dcos.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - karlkfi
-
+title: DCOS
 ---
 
 This guide will walk you through installing [Kubernetes-Mesos](https://github.com/mesosphere/kubernetes-mesos) on [Datacenter Operating System (DCOS)](https://mesosphere.com/product/) with the [DCOS CLI](https://github.com/mesosphere/dcos-cli) and operating Kubernetes with the [DCOS Kubectl plugin](https://github.com/mesosphere/dcos-kubectl).
diff --git a/docs/getting-started-guides/docker-multinode.md b/docs/getting-started-guides/docker-multinode.md
index 5d6d4ee295..4483562282 100644
--- a/docs/getting-started-guides/docker-multinode.md
+++ b/docs/getting-started-guides/docker-multinode.md
@@ -1,4 +1,5 @@
 ---
+title: Portable Multi-Node Cluster
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/fedora/fedora_ansible_config.md b/docs/getting-started-guides/fedora/fedora_ansible_config.md
index b5fe3802e0..388ba78c2d 100644
--- a/docs/getting-started-guides/fedora/fedora_ansible_config.md
+++ b/docs/getting-started-guides/fedora/fedora_ansible_config.md
@@ -2,7 +2,7 @@
 assignees:
 - aveshagarwal
 - erictune
-
+title: Fedora via Ansible
 ---
 
 Configuring Kubernetes on Fedora via Ansible offers a simple way to quickly create a clustered environment with little effort.
diff --git a/docs/getting-started-guides/fedora/fedora_manual_config.md b/docs/getting-started-guides/fedora/fedora_manual_config.md
index d1948530a8..5d2ed30ac6 100644
--- a/docs/getting-started-guides/fedora/fedora_manual_config.md
+++ b/docs/getting-started-guides/fedora/fedora_manual_config.md
@@ -3,7 +3,7 @@ assignees:
 - aveshagarwal
 - eparis
 - thockin
-
+title: Fedora (Single Node)
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
index bcd10f57b9..c9f9c1ee56 100644
--- a/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+++ b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
@@ -3,8 +3,9 @@ assignees:
 - dchen1107
 - erictune
 - thockin
-
+title: Fedora (Multi Node)
 ---
+
 * TOC
 {:toc}
 
diff --git a/docs/getting-started-guides/gce.md b/docs/getting-started-guides/gce.md
index 778795c3db..29388ceb9a 100644
--- a/docs/getting-started-guides/gce.md
+++ b/docs/getting-started-guides/gce.md
@@ -4,10 +4,9 @@ assignees:
 - jbeda
 - mikedanese
 - thockin
-
+title: Running Kubernetes on Google Compute Engine
 ---
 
-
 The example below creates a Kubernetes cluster with 4 worker node Virtual Machines and a master Virtual Machine (i.e. 5 VMs in your cluster). This cluster is set up and controlled from your workstation (or wherever you find convenient).
 
 * TOC
diff --git a/docs/getting-started-guides/index.md b/docs/getting-started-guides/index.md
index 609a0cc03d..69ee94ac27 100644
--- a/docs/getting-started-guides/index.md
+++ b/docs/getting-started-guides/index.md
@@ -3,7 +3,7 @@ assignees:
 - brendandburns
 - erictune
 - mikedanese
-
+title: Picking the Right Solution
 ---
 
 Kubernetes can run on a range of platforms, from your laptop, to VMs on a cloud provider, to rack of
diff --git a/docs/getting-started-guides/kops.md b/docs/getting-started-guides/kops.md
index a02a829471..778abe188c 100644
--- a/docs/getting-started-guides/kops.md
+++ b/docs/getting-started-guides/kops.md
@@ -1,4 +1,5 @@
 ---
+title: Installing Kubernetes on AWS with kops
 ---
 
 <style>
diff --git a/docs/getting-started-guides/kubeadm.md b/docs/getting-started-guides/kubeadm.md
index a122180b23..5abbf39b20 100644
--- a/docs/getting-started-guides/kubeadm.md
+++ b/docs/getting-started-guides/kubeadm.md
@@ -4,7 +4,7 @@ assignees:
 - luxas
 - errordeveloper
 - jbeda
-
+title: Installing Kubernetes on Linux with kubeadm
 ---
 
 <style>
diff --git a/docs/getting-started-guides/kubectl.md b/docs/getting-started-guides/kubectl.md
index bd2512707b..8dc6fc10f7 100644
--- a/docs/getting-started-guides/kubectl.md
+++ b/docs/getting-started-guides/kubectl.md
@@ -1,4 +1,5 @@
 ---
+title: Installing kubectl
 ---
 
 <style>
diff --git a/docs/getting-started-guides/libvirt-coreos.md b/docs/getting-started-guides/libvirt-coreos.md
index 180d3f6c9c..73be7e4261 100644
--- a/docs/getting-started-guides/libvirt-coreos.md
+++ b/docs/getting-started-guides/libvirt-coreos.md
@@ -2,7 +2,7 @@
 assignees:
 - erictune
 - idvoretskyi
-
+title: CoreOS on libvirt
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/logging-elasticsearch.md b/docs/getting-started-guides/logging-elasticsearch.md
index 3200bba625..86fce1f02a 100644
--- a/docs/getting-started-guides/logging-elasticsearch.md
+++ b/docs/getting-started-guides/logging-elasticsearch.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - satnam6502
-
+title: Logging with Elasticsearch and Kibana
 ---
 
 On the Google Compute Engine (GCE) platform, the default logging support targets
diff --git a/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md
index 8a5f7d9247..ff874e119d 100644
--- a/docs/getting-started-guides/logging.md
+++ b/docs/getting-started-guides/logging.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - satnam6502
-
+title: Logging
 ---
 
 A Kubernetes cluster will typically be humming along running many system and application pods. How does the system administrator collect, manage and query the logs of the system pods? How does a user query the logs of their application which is composed of many pods which may be restarted or automatically generated by the Kubernetes system? These questions are addressed by the Kubernetes **cluster level logging** services.
diff --git a/docs/getting-started-guides/meanstack.md b/docs/getting-started-guides/meanstack.md
index 7287168bcd..37df0513f7 100644
--- a/docs/getting-started-guides/meanstack.md
+++ b/docs/getting-started-guides/meanstack.md
@@ -1,5 +1,5 @@
 ---
-
+title: MEAN stack on Google Cloud Platform
 ---
 
 **By: Sandeep Dinesh** - _July 29, 2015_
diff --git a/docs/getting-started-guides/mesos-docker.md b/docs/getting-started-guides/mesos-docker.md
index eb9ccbc0ad..d397f3ec31 100644
--- a/docs/getting-started-guides/mesos-docker.md
+++ b/docs/getting-started-guides/mesos-docker.md
@@ -2,10 +2,9 @@
 assignees:
 - jdef
 - karlkfi
-
+title: Kubernetes on Mesos on Docker
 ---
 
-
 The mesos/docker provider uses docker-compose to launch Kubernetes as a Mesos framework, running in docker with its
 dependencies (etcd & mesos).
 
diff --git a/docs/getting-started-guides/mesos/index.md b/docs/getting-started-guides/mesos/index.md
index 2d909145a3..948eae1a41 100644
--- a/docs/getting-started-guides/mesos/index.md
+++ b/docs/getting-started-guides/mesos/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - jdef
-
+title: Kubernetes on Mesos
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/minikube.md b/docs/getting-started-guides/minikube.md
index 9d0264ccb3..ef32f82a57 100644
--- a/docs/getting-started-guides/minikube.md
+++ b/docs/getting-started-guides/minikube.md
@@ -3,7 +3,7 @@ assignees:
 - dlorenc
 - janetkuo
 - jlowdermilk
-
+title: Running Kubernetes Locally via Minikube
 ---
 
 Minikube is a tool that makes it easy to run Kubernetes locally. Minikube runs a single-node Kubernetes cluster inside a VM on your laptop for users looking to try out Kubernetes or develop with it day-to-day.
diff --git a/docs/getting-started-guides/network-policy/calico.md b/docs/getting-started-guides/network-policy/calico.md
index be84644aa6..a411fba163 100644
--- a/docs/getting-started-guides/network-policy/calico.md
+++ b/docs/getting-started-guides/network-policy/calico.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - caseydavenport
-
+title: Using Calico for NetworkPolicy
 ---
 
 You can deploy a cluster using Calico for network policy in the default [GCE deployment](/docs/getting-started-guides/gce) using the following set of commands:
diff --git a/docs/getting-started-guides/network-policy/romana.md b/docs/getting-started-guides/network-policy/romana.md
index c25835ebb0..d74479952a 100644
--- a/docs/getting-started-guides/network-policy/romana.md
+++ b/docs/getting-started-guides/network-policy/romana.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - chrismarino
-
+title: Using Romana for NetworkPolicy
 ---
 
 # Installation with kubeadm
diff --git a/docs/getting-started-guides/network-policy/walkthrough.md b/docs/getting-started-guides/network-policy/walkthrough.md
index 4f1b4e8c30..21a74278c5 100644
--- a/docs/getting-started-guides/network-policy/walkthrough.md
+++ b/docs/getting-started-guides/network-policy/walkthrough.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - caseydavenport
-
+title: Example Walkthrough
 ---
 
 Kubernetes can be used to declare network policies which govern how Pods can communicate with each other.  This document helps you get started using the Kubernetes [NetworkPolicy API](/docs/user-guide/networkpolicies), and provides a demonstration thereof. 
diff --git a/docs/getting-started-guides/openstack-heat.md b/docs/getting-started-guides/openstack-heat.md
index 25a7264ced..ef41fc847f 100644
--- a/docs/getting-started-guides/openstack-heat.md
+++ b/docs/getting-started-guides/openstack-heat.md
@@ -2,7 +2,7 @@
 assignees:
 - idvoretskyi
 - xsgordon
-
+title: OpenStack Heat
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/ovirt.md b/docs/getting-started-guides/ovirt.md
index d22b36fe0f..7d1bbf6fe9 100644
--- a/docs/getting-started-guides/ovirt.md
+++ b/docs/getting-started-guides/ovirt.md
@@ -2,7 +2,7 @@
 assignees:
 - caesarxuchao
 - erictune
-
+title: oVirt
 ---
 
 * TOC
diff --git a/docs/getting-started-guides/photon-controller.md b/docs/getting-started-guides/photon-controller.md
index c9c317ca07..ec9d9511fa 100644
--- a/docs/getting-started-guides/photon-controller.md
+++ b/docs/getting-started-guides/photon-controller.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - bprashanth
-
+title: VMware Photon Controller
 ---
 
 The example below creates a Kubernetes cluster using VMware's Photon
diff --git a/docs/getting-started-guides/rackspace.md b/docs/getting-started-guides/rackspace.md
index 5087344b83..00c73a8e59 100644
--- a/docs/getting-started-guides/rackspace.md
+++ b/docs/getting-started-guides/rackspace.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - erictune
-
+title: CoreOS on Rackspace
 ---
 
 * Supported Version: v0.18.1
diff --git a/docs/getting-started-guides/rkt/index.md b/docs/getting-started-guides/rkt/index.md
index cc1743024f..2e6a473370 100644
--- a/docs/getting-started-guides/rkt/index.md
+++ b/docs/getting-started-guides/rkt/index.md
@@ -2,7 +2,7 @@
 assignees:
 - lavalamp
 - yifan-gu
-
+title: Running Kubernetes with rkt
 ---
 
 This document describes how to run Kubernetes using [rkt](https://github.com/coreos/rkt) as the container runtime.
diff --git a/docs/getting-started-guides/rkt/notes.md b/docs/getting-started-guides/rkt/notes.md
index 096beab3c5..2654ed22f7 100644
--- a/docs/getting-started-guides/rkt/notes.md
+++ b/docs/getting-started-guides/rkt/notes.md
@@ -2,7 +2,7 @@
 assignees:
 - dchen1107
 - yifan-gu
-
+title: Known Issues when Using rkt
 ---
 
 The following features either are not supported or have large caveats when using the rkt container runtime. Increasing support for these items and others, including reasonable feature parity with the default container engine, is planned through future releases.
diff --git a/docs/getting-started-guides/scratch.md b/docs/getting-started-guides/scratch.md
index 3fc23ec3dc..ebb765fec6 100644
--- a/docs/getting-started-guides/scratch.md
+++ b/docs/getting-started-guides/scratch.md
@@ -3,7 +3,7 @@ assignees:
 - erictune
 - lavalamp
 - thockin
-
+title: Creating a Custom Cluster from Scratch
 ---
 
 This guide is for people who want to craft a custom Kubernetes cluster.  If you
diff --git a/docs/getting-started-guides/vsphere.md b/docs/getting-started-guides/vsphere.md
index a1e59b0cd0..f605fe6dc2 100644
--- a/docs/getting-started-guides/vsphere.md
+++ b/docs/getting-started-guides/vsphere.md
@@ -2,7 +2,7 @@
 assignees:
 - erictune
 - jbeda
-
+title: VMware vSphere
 ---
 
 The example below creates a Kubernetes cluster with 4 worker node Virtual
diff --git a/docs/getting-started-guides/windows/index.md b/docs/getting-started-guides/windows/index.md
index ca6acdfa01..511d125dcd 100644
--- a/docs/getting-started-guides/windows/index.md
+++ b/docs/getting-started-guides/windows/index.md
@@ -1,5 +1,5 @@
 ---
-
+title: Windows Server Containers
 ---
 
 Kubernetes version 1.5 introduces support for Windows Server Containers. In version 1.5, the Kubernetes control plane (API Server, Scheduler, Controller Manager, etc) continue to run on Linux, while the kubelet and kube-proxy can be run on Windows Server.
diff --git a/docs/hellonode.md b/docs/hellonode.md
index 26f271c857..bcff7c6f99 100755
--- a/docs/hellonode.md
+++ b/docs/hellonode.md
@@ -2,7 +2,7 @@
 assignees:
 - dchen1107
 - pwittrock
-
+title: Hello World on Google Container Engine
 ---
 
 * TOC
diff --git a/docs/index.md b/docs/index.md
index c430dac710..24814e55ae 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - thockin
-
+title: Kubernetes Documentation
 ---
 
 <p>Kubernetes documentation can help you set up Kubernetes, learn about the system, or get your applications and workloads running on Kubernetes. To learn the basics of what Kubernetes is and how it works, read "<a href="/docs/whatisk8s/">What is Kubernetes</a>". </p>
diff --git a/docs/reference.md b/docs/reference.md
index 88f35a74f4..1269a88fae 100644
--- a/docs/reference.md
+++ b/docs/reference.md
@@ -1,6 +1,7 @@
 ---
+title: Reference Documentation
+---
 
----
 In the reference section, you can find reference documentation for Kubernetes APIs, CLIs, and tools, as well as our glossary and design docs. 
 
 ## API References
diff --git a/docs/reporting-security-issues.md b/docs/reporting-security-issues.md
index da4da20b3c..f9742534af 100644
--- a/docs/reporting-security-issues.md
+++ b/docs/reporting-security-issues.md
@@ -2,7 +2,7 @@
 assignees:
 - eparis
 - erictune
-
+title: Report a Security Vulnerability
 ---
 
 If you believe you have discovered a vulnerability or a have a security incident to report, please follow the steps below. This applies to Kubernetes releases v1.0 or later.
diff --git a/docs/samples.md b/docs/samples.md
index 5f54896133..881d898fc3 100644
--- a/docs/samples.md
+++ b/docs/samples.md
@@ -1,8 +1,9 @@
 ---
 assignees:
 - bgrant0607
-
+title: Samples
 ---
+
 We have a wide variety of samples to choose from.
 
 ## Recently updated samples
diff --git a/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md b/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
index 41726c0afd..4b0acb8f88 100644
--- a/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
+++ b/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
@@ -1,4 +1,5 @@
 ---
+title: Using Port Forwarding to Access Applications in a Cluster
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/access-kubernetes-api/http-proxy-access-api.md b/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
index fad85fcadf..9dee7c9c4d 100644
--- a/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
+++ b/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
@@ -1,4 +1,5 @@
 ---
+title: Using an HTTP Proxy to Access the Kubernetes API
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/administer-cluster/assign-pods-nodes.md b/docs/tasks/administer-cluster/assign-pods-nodes.md
index 4468b92701..03dc0c021c 100644
--- a/docs/tasks/administer-cluster/assign-pods-nodes.md
+++ b/docs/tasks/administer-cluster/assign-pods-nodes.md
@@ -1,4 +1,5 @@
 ---
+title: Assigning Pods to Nodes
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md b/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
index 6ccc505468..fa8202865d 100644
--- a/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
+++ b/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
@@ -1,4 +1,5 @@
 ---
+title: Autoscaling the DNS Service in a Cluster
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/administer-cluster/safely-drain-node.md b/docs/tasks/administer-cluster/safely-drain-node.md
index b1fd572419..87fbd85d8a 100644
--- a/docs/tasks/administer-cluster/safely-drain-node.md
+++ b/docs/tasks/administer-cluster/safely-drain-node.md
@@ -1,9 +1,9 @@
 ---
 assignees:
 - davidopp
-
+title: Safely Draining a Node while Respecting Application SLOs
 ---
- 
+
 {% capture overview %}
 This page shows how to safely drain a machine, respecting the application-level
 disruption SLOs you have specified using PodDisruptionBudget.
diff --git a/docs/tasks/configure-pod-container/assign-cpu-ram-container.md b/docs/tasks/configure-pod-container/assign-cpu-ram-container.md
index 2e852a7660..fe860a2deb 100644
--- a/docs/tasks/configure-pod-container/assign-cpu-ram-container.md
+++ b/docs/tasks/configure-pod-container/assign-cpu-ram-container.md
@@ -1,4 +1,5 @@
 ---
+title: Assigning CPU and RAM Resources to a Container
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/configure-pod-container/configure-volume-storage.md b/docs/tasks/configure-pod-container/configure-volume-storage.md
index 9097548ada..6919a91fb0 100644
--- a/docs/tasks/configure-pod-container/configure-volume-storage.md
+++ b/docs/tasks/configure-pod-container/configure-volume-storage.md
@@ -1,4 +1,5 @@
 ---
+title: Configuring a Pod to Use a Volume for Storage
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/configure-pod-container/define-command-argument-container.md b/docs/tasks/configure-pod-container/define-command-argument-container.md
index 85befe43e0..4fd988744d 100644
--- a/docs/tasks/configure-pod-container/define-command-argument-container.md
+++ b/docs/tasks/configure-pod-container/define-command-argument-container.md
@@ -1,4 +1,5 @@
 ---
+title: Defining a Command and Arguments for a Container
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/configure-pod-container/define-environment-variable-container.md b/docs/tasks/configure-pod-container/define-environment-variable-container.md
index 25e90c7fb4..f24f1bcc8a 100644
--- a/docs/tasks/configure-pod-container/define-environment-variable-container.md
+++ b/docs/tasks/configure-pod-container/define-environment-variable-container.md
@@ -1,4 +1,5 @@
 ---
+title: Defining Environment Variables for a Container
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/configure-pod-container/distribute-credentials-secure.md b/docs/tasks/configure-pod-container/distribute-credentials-secure.md
index c2828315cb..48272a7cba 100644
--- a/docs/tasks/configure-pod-container/distribute-credentials-secure.md
+++ b/docs/tasks/configure-pod-container/distribute-credentials-secure.md
@@ -1,4 +1,5 @@
 ---
+title: Distributing Credentials Securely
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md b/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
index 5710150a76..3f1c5fbc89 100644
--- a/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
+++ b/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
@@ -1,4 +1,5 @@
 ---
+title: Determining the Reason for Pod Failure
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/index.md b/docs/tasks/index.md
index 6a2aaee6a4..a97a43b538 100644
--- a/docs/tasks/index.md
+++ b/docs/tasks/index.md
@@ -1,4 +1,5 @@
 ---
+title: Tasks
 ---
 
 This section of the Kubernetes documentation contains pages that
diff --git a/docs/tasks/manage-stateful-set/debugging-a-statefulset.md b/docs/tasks/manage-stateful-set/debugging-a-statefulset.md
index 46ce39fd41..2266d7a323 100644
--- a/docs/tasks/manage-stateful-set/debugging-a-statefulset.md
+++ b/docs/tasks/manage-stateful-set/debugging-a-statefulset.md
@@ -7,7 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
-
+title: Debugging a StatefulSet
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/delete-pods.md b/docs/tasks/manage-stateful-set/delete-pods.md
index 756acef919..4b31def936 100644
--- a/docs/tasks/manage-stateful-set/delete-pods.md
+++ b/docs/tasks/manage-stateful-set/delete-pods.md
@@ -4,7 +4,7 @@ assignees:
 - erictune
 - foxish
 - smarterclayton
-
+title: Force Deleting StatefulSet Pods
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/deleting-a-statefulset.md b/docs/tasks/manage-stateful-set/deleting-a-statefulset.md
index 0f840614d9..d95d28a2d8 100644
--- a/docs/tasks/manage-stateful-set/deleting-a-statefulset.md
+++ b/docs/tasks/manage-stateful-set/deleting-a-statefulset.md
@@ -5,7 +5,7 @@ assignees:
 - foxish
 - janetkuo
 - smarterclayton
-
+title: Deleting a Stateful Set
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/scale-stateful-set.md b/docs/tasks/manage-stateful-set/scale-stateful-set.md
index 3bd5e3b1ba..d00fbc055b 100644
--- a/docs/tasks/manage-stateful-set/scale-stateful-set.md
+++ b/docs/tasks/manage-stateful-set/scale-stateful-set.md
@@ -7,7 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
-
+title: Scaling a StatefulSet
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set.md b/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set.md
index 8113eff11e..592d07f833 100644
--- a/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set.md
+++ b/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set.md
@@ -7,7 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
-
+title: Upgrading from PetSets to StatefulSets
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/troubleshoot/debug-init-containers.md b/docs/tasks/troubleshoot/debug-init-containers.md
index 73267fddd2..8de65d8868 100644
--- a/docs/tasks/troubleshoot/debug-init-containers.md
+++ b/docs/tasks/troubleshoot/debug-init-containers.md
@@ -7,7 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
-
+title: Debugging Init Containers
 ---
 
 {% capture overview %}
diff --git a/docs/tools/index.md b/docs/tools/index.md
index 482df866b4..bb29a998f4 100644
--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - janetkuo
-
+title: Tools
 ---
 
 * TOC
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 63d307e911..7a8e11d2d5 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -2,7 +2,7 @@
 assignees:
 - brendandburns
 - davidopp
-
+title: Support
 ---
 
 ## Troubleshooting
diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md
index 1b52a15e1a..7b980d0395 100644
--- a/docs/tutorials/index.md
+++ b/docs/tutorials/index.md
@@ -1,4 +1,5 @@
 ---
+title: Tutorials
 ---
 
 This section of the Kubernetes documentation contains tutorials.
diff --git a/docs/tutorials/kubernetes-basics/cluster-interactive.html b/docs/tutorials/kubernetes-basics/cluster-interactive.html
index f1de469494..da0df10297 100644
--- a/docs/tutorials/kubernetes-basics/cluster-interactive.html
+++ b/docs/tutorials/kubernetes-basics/cluster-interactive.html
@@ -1,4 +1,5 @@
 ---
+title: Interactive Tutorial - Creating a Cluster
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/cluster-intro.html b/docs/tutorials/kubernetes-basics/cluster-intro.html
index b0f72dc9eb..6009a55aeb 100644
--- a/docs/tutorials/kubernetes-basics/cluster-intro.html
+++ b/docs/tutorials/kubernetes-basics/cluster-intro.html
@@ -1,7 +1,8 @@
 ---
 redirect_from:
-  - /docs/tutorials/getting-started/create-cluster/
-  - /docs/tutorials/getting-started/create-cluster.html
+- "/docs/tutorials/getting-started/create-cluster/"
+- "/docs/tutorials/getting-started/create-cluster.html"
+title: Using Minikube to Create a Cluster
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/deploy-interactive.html b/docs/tutorials/kubernetes-basics/deploy-interactive.html
index ff3e4643d5..5fe4990723 100644
--- a/docs/tutorials/kubernetes-basics/deploy-interactive.html
+++ b/docs/tutorials/kubernetes-basics/deploy-interactive.html
@@ -1,4 +1,5 @@
 ---
+title: Interactive Tutorial - Deploying an App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/deploy-intro.html b/docs/tutorials/kubernetes-basics/deploy-intro.html
index f7f80982bf..5352e0ea38 100644
--- a/docs/tutorials/kubernetes-basics/deploy-intro.html
+++ b/docs/tutorials/kubernetes-basics/deploy-intro.html
@@ -1,4 +1,5 @@
 ---
+title: Using kubectl to Create a Deployment
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/explore-interactive.html b/docs/tutorials/kubernetes-basics/explore-interactive.html
index db8d52a482..ff007f80d1 100644
--- a/docs/tutorials/kubernetes-basics/explore-interactive.html
+++ b/docs/tutorials/kubernetes-basics/explore-interactive.html
@@ -1,4 +1,5 @@
 ---
+title: Interactive Tutorial - Exploring Your App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/explore-intro.html b/docs/tutorials/kubernetes-basics/explore-intro.html
index b288062650..edc813d3d4 100644
--- a/docs/tutorials/kubernetes-basics/explore-intro.html
+++ b/docs/tutorials/kubernetes-basics/explore-intro.html
@@ -1,4 +1,5 @@
 ---
+title: Viewing Pods and Nodes
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/expose-interactive.html b/docs/tutorials/kubernetes-basics/expose-interactive.html
index 56b9ca4861..26b30492a6 100644
--- a/docs/tutorials/kubernetes-basics/expose-interactive.html
+++ b/docs/tutorials/kubernetes-basics/expose-interactive.html
@@ -1,4 +1,5 @@
 ---
+title: Interactive Tutorial - Exposing Your App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/expose-intro.html b/docs/tutorials/kubernetes-basics/expose-intro.html
index 524e051c68..2d3c4d7bb4 100644
--- a/docs/tutorials/kubernetes-basics/expose-intro.html
+++ b/docs/tutorials/kubernetes-basics/expose-intro.html
@@ -1,4 +1,5 @@
 ---
+title: Using a Service to Expose Your App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/index.html b/docs/tutorials/kubernetes-basics/index.html
index 7edee6fd53..eac6d89492 100644
--- a/docs/tutorials/kubernetes-basics/index.html
+++ b/docs/tutorials/kubernetes-basics/index.html
@@ -1,4 +1,5 @@
 ---
+title: Overview
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/scale-interactive.html b/docs/tutorials/kubernetes-basics/scale-interactive.html
index aa2134864d..dba3f3b1df 100644
--- a/docs/tutorials/kubernetes-basics/scale-interactive.html
+++ b/docs/tutorials/kubernetes-basics/scale-interactive.html
@@ -1,4 +1,5 @@
 ---
+title: Interactive Tutorial - Scaling Your App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/scale-intro.html b/docs/tutorials/kubernetes-basics/scale-intro.html
index 4a552f68ba..49b9e49dec 100644
--- a/docs/tutorials/kubernetes-basics/scale-intro.html
+++ b/docs/tutorials/kubernetes-basics/scale-intro.html
@@ -1,4 +1,5 @@
 ---
+title: Running Multiple Instances of Your App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/update-interactive.html b/docs/tutorials/kubernetes-basics/update-interactive.html
index a1399aeadb..e011269f1d 100644
--- a/docs/tutorials/kubernetes-basics/update-interactive.html
+++ b/docs/tutorials/kubernetes-basics/update-interactive.html
@@ -1,4 +1,5 @@
 ---
+title: Interactive Tutorial - Updating Your App
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/kubernetes-basics/update-intro.html b/docs/tutorials/kubernetes-basics/update-intro.html
index 73b8477df7..9ed498ce35 100644
--- a/docs/tutorials/kubernetes-basics/update-intro.html
+++ b/docs/tutorials/kubernetes-basics/update-intro.html
@@ -1,4 +1,5 @@
 ---
+title: Performing a Rolling Update
 ---
 
 <!DOCTYPE html>
diff --git a/docs/tutorials/stateful-application/basic-stateful-set.md b/docs/tutorials/stateful-application/basic-stateful-set.md
index 952f4d20f0..07e41cd56d 100644
--- a/docs/tutorials/stateful-application/basic-stateful-set.md
+++ b/docs/tutorials/stateful-application/basic-stateful-set.md
@@ -7,6 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
+title: StatefulSet Basics
 ---
 
 {% capture overview %}
diff --git a/docs/tutorials/stateful-application/run-replicated-stateful-application.md b/docs/tutorials/stateful-application/run-replicated-stateful-application.md
index db4a69b22f..29f0d68242 100644
--- a/docs/tutorials/stateful-application/run-replicated-stateful-application.md
+++ b/docs/tutorials/stateful-application/run-replicated-stateful-application.md
@@ -7,7 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
-
+title: Running a Replicated Stateful Application
 ---
 
 {% capture overview %}
diff --git a/docs/tutorials/stateful-application/run-stateful-application.md b/docs/tutorials/stateful-application/run-stateful-application.md
index 443d9cdea5..928aaecacd 100644
--- a/docs/tutorials/stateful-application/run-stateful-application.md
+++ b/docs/tutorials/stateful-application/run-stateful-application.md
@@ -1,4 +1,5 @@
 ---
+title: Running a Single-Instance Stateful Application
 ---
 
 {% capture overview %}
diff --git a/docs/tutorials/stateful-application/zookeeper.md b/docs/tutorials/stateful-application/zookeeper.md
index 38315cd37a..90a78fdc31 100644
--- a/docs/tutorials/stateful-application/zookeeper.md
+++ b/docs/tutorials/stateful-application/zookeeper.md
@@ -7,6 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
+title: Running ZooKeeper, A CP Distributed System
 ---
 
 {% capture overview %}
diff --git a/docs/tutorials/stateless-application/expose-external-ip-address-service.md b/docs/tutorials/stateless-application/expose-external-ip-address-service.md
index e9da4f7a37..23bffda9df 100644
--- a/docs/tutorials/stateless-application/expose-external-ip-address-service.md
+++ b/docs/tutorials/stateless-application/expose-external-ip-address-service.md
@@ -1,4 +1,5 @@
 ---
+title: Using a Service to Access an Application in a Cluster
 ---
 
 {% capture overview %}
diff --git a/docs/tutorials/stateless-application/expose-external-ip-address.md b/docs/tutorials/stateless-application/expose-external-ip-address.md
index be47728120..e740b6df05 100644
--- a/docs/tutorials/stateless-application/expose-external-ip-address.md
+++ b/docs/tutorials/stateless-application/expose-external-ip-address.md
@@ -1,4 +1,5 @@
 ---
+title: Exposing an External IP Address to Access an Application in a Cluster
 ---
 
 {% capture overview %}
diff --git a/docs/tutorials/stateless-application/run-stateless-application-deployment.md b/docs/tutorials/stateless-application/run-stateless-application-deployment.md
index 7ea6efa408..ce1a713a1c 100644
--- a/docs/tutorials/stateless-application/run-stateless-application-deployment.md
+++ b/docs/tutorials/stateless-application/run-stateless-application-deployment.md
@@ -1,4 +1,5 @@
 ---
+title: Running a Stateless Application Using a Deployment
 ---
 
 {% capture overview %}
diff --git a/docs/user-guide/accessing-the-cluster.md b/docs/user-guide/accessing-the-cluster.md
index 63134b4909..8206ee8f85 100644
--- a/docs/user-guide/accessing-the-cluster.md
+++ b/docs/user-guide/accessing-the-cluster.md
@@ -1,10 +1,10 @@
----
-assignees:
-- lavalamp
-- mikedanese
-
----
-
+---
+assignees:
+- lavalamp
+- mikedanese
+title: Accessing Clusters
+---
+
 * TOC
 {:toc}
 
diff --git a/docs/user-guide/annotations.md b/docs/user-guide/annotations.md
index 181a1faed0..497706c3ad 100644
--- a/docs/user-guide/annotations.md
+++ b/docs/user-guide/annotations.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Annotations
 ---
 
 We have [labels](/docs/user-guide/labels) for identifying metadata.
diff --git a/docs/user-guide/application-troubleshooting.md b/docs/user-guide/application-troubleshooting.md
index b88cc4483d..817095f13d 100644
--- a/docs/user-guide/application-troubleshooting.md
+++ b/docs/user-guide/application-troubleshooting.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Troubleshooting Applications
 ---
 
 This guide is to help users debug applications that are deployed into Kubernetes and not behaving correctly.
diff --git a/docs/user-guide/compute-resources.md b/docs/user-guide/compute-resources.md
index a821863f1b..2aac91d0ba 100644
--- a/docs/user-guide/compute-resources.md
+++ b/docs/user-guide/compute-resources.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Managing Compute Resources
 ---
 
 * TOC
diff --git a/docs/user-guide/config-best-practices.md b/docs/user-guide/config-best-practices.md
index 5cafa35f60..2811d84ed0 100644
--- a/docs/user-guide/config-best-practices.md
+++ b/docs/user-guide/config-best-practices.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Best Practices for Configuration
 ---
 
 This document is meant to highlight and consolidate in one place configuration best practices that are introduced throughout the user-guide and getting-started documentation and examples. This is a living document so if you think of something that is not on this list but might be useful to others, please don't hesitate to file an issue or submit a PR.
diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md
index f37c83f4ac..90551dddb1 100644
--- a/docs/user-guide/configmap/index.md
+++ b/docs/user-guide/configmap/index.md
@@ -2,8 +2,9 @@
 assignees:
 - eparis
 - pmorie
-
+title: Using ConfigMap
 ---
+
 Many applications require configuration via some combination of config files, command line
 arguments, and environment variables.  These configuration artifacts should be decoupled from image
 content in order to keep containerized applications portable.  The ConfigMap API resource provides
diff --git a/docs/user-guide/configuring-containers.md b/docs/user-guide/configuring-containers.md
index 99dc823375..1fa82f52e9 100644
--- a/docs/user-guide/configuring-containers.md
+++ b/docs/user-guide/configuring-containers.md
@@ -2,7 +2,7 @@
 assignees:
 - caesarxuchao
 - thockin
-
+title: Configuring Containers
 ---
 
 * TOC
diff --git a/docs/user-guide/connecting-applications.md b/docs/user-guide/connecting-applications.md
index f75187d6c6..95d365bdb1 100644
--- a/docs/user-guide/connecting-applications.md
+++ b/docs/user-guide/connecting-applications.md
@@ -3,7 +3,7 @@ assignees:
 - caesarxuchao
 - lavalamp
 - thockin
-
+title: Connecting Applications with Services
 ---
 
 * TOC
diff --git a/docs/user-guide/connecting-to-applications-port-forward.md b/docs/user-guide/connecting-to-applications-port-forward.md
index 5876d2ab48..4855994736 100644
--- a/docs/user-guide/connecting-to-applications-port-forward.md
+++ b/docs/user-guide/connecting-to-applications-port-forward.md
@@ -2,7 +2,7 @@
 assignees:
 - caesarxuchao
 - mikedanese
-
+title: Connect with Port Forwarding
 ---
 
 kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](/docs/user-guide/kubectl/kubectl_port-forward). Compared to [kubectl proxy](/docs/user-guide/accessing-the-cluster/#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging.
diff --git a/docs/user-guide/connecting-to-applications-proxy.md b/docs/user-guide/connecting-to-applications-proxy.md
index 5404d2e769..559b06da9f 100644
--- a/docs/user-guide/connecting-to-applications-proxy.md
+++ b/docs/user-guide/connecting-to-applications-proxy.md
@@ -2,7 +2,7 @@
 assignees:
 - caesarxuchao
 - lavalamp
-
+title: Connect with Proxies
 ---
 
 You have seen the [basics](/docs/user-guide/accessing-the-cluster) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](/docs/user-guide/ui)) running on the Kubernetes cluster from your workstation.
diff --git a/docs/user-guide/container-environment.md b/docs/user-guide/container-environment.md
index 165d135de2..f3996b2eb5 100644
--- a/docs/user-guide/container-environment.md
+++ b/docs/user-guide/container-environment.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Container Lifecycle Hooks
 ---
 
 This document describes the environment for Kubelet managed containers on a Kubernetes node (kNode).  In contrast to the Kubernetes cluster API, which provides an API for creating and managing containers, the Kubernetes container environment provides the container access to information about what else is going on in the cluster.
diff --git a/docs/user-guide/containers.md b/docs/user-guide/containers.md
index 83246e6fd0..f04b6f87d9 100644
--- a/docs/user-guide/containers.md
+++ b/docs/user-guide/containers.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Commands and Capabilities
 ---
 
 * TOC
diff --git a/docs/user-guide/cron-jobs.md b/docs/user-guide/cron-jobs.md
index 6d88997cb3..89cb58c0b8 100644
--- a/docs/user-guide/cron-jobs.md
+++ b/docs/user-guide/cron-jobs.md
@@ -3,7 +3,7 @@ assignees:
 - erictune
 - soltysh
 - janetkuo
-
+title: Cron Jobs
 ---
 
 * TOC
diff --git a/docs/user-guide/debugging-pods-and-replication-controllers.md b/docs/user-guide/debugging-pods-and-replication-controllers.md
index a02de467bd..1242d331c7 100644
--- a/docs/user-guide/debugging-pods-and-replication-controllers.md
+++ b/docs/user-guide/debugging-pods-and-replication-controllers.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - bprashanth
-
+title: Debugging Pods and Replication Controllers
 ---
 
 * TOC
diff --git a/docs/user-guide/debugging-services.md b/docs/user-guide/debugging-services.md
index d7e13889f4..35d63bb941 100644
--- a/docs/user-guide/debugging-services.md
+++ b/docs/user-guide/debugging-services.md
@@ -3,7 +3,7 @@ assignees:
 - bprashanth
 - janetkuo
 - thockin
-
+title: Debugging Services
 ---
 
 An issue that comes up rather frequently for new installations of Kubernetes is
diff --git a/docs/user-guide/deploying-applications.md b/docs/user-guide/deploying-applications.md
index 455a3378d2..9bbcd34282 100644
--- a/docs/user-guide/deploying-applications.md
+++ b/docs/user-guide/deploying-applications.md
@@ -3,10 +3,9 @@ assignees:
 - bgrant0607
 - caesarxuchao
 - thockin
-
+title: Deploying Applications
 ---
 
-
 * TOC
 {:toc}
 
diff --git a/docs/user-guide/deployments.md b/docs/user-guide/deployments.md
index 84ea561bf4..6df9d19c38 100644
--- a/docs/user-guide/deployments.md
+++ b/docs/user-guide/deployments.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - janetkuo
-
+title: Deployments
 ---
 
 * TOC
diff --git a/docs/user-guide/docker-cli-to-kubectl.md b/docs/user-guide/docker-cli-to-kubectl.md
index 8438b2b356..152810e45c 100644
--- a/docs/user-guide/docker-cli-to-kubectl.md
+++ b/docs/user-guide/docker-cli-to-kubectl.md
@@ -3,7 +3,7 @@ assignees:
 - bgrant0607
 - brendandburns
 - thockin
-
+title: kubectl for Docker Users
 ---
 
 In this doc, we introduce the Kubernetes command line for interacting with the api to docker-cli users. The tool, kubectl, is designed to be familiar to docker-cli users but there are a few necessary differences. Each section of this doc highlights a docker subcommand explains the kubectl equivalent.
diff --git a/docs/user-guide/downward-api/index.md b/docs/user-guide/downward-api/index.md
index b485c98c00..1b4166ae66 100644
--- a/docs/user-guide/downward-api/index.md
+++ b/docs/user-guide/downward-api/index.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - mikedanese
-
+title: Using the Downward API to Convey Pod Properties
 ---
 
 It is sometimes useful for a container to have information about itself, but we
diff --git a/docs/user-guide/downward-api/volume/index.md b/docs/user-guide/downward-api/volume/index.md
index 46f54d0776..882b2da1e9 100644
--- a/docs/user-guide/downward-api/volume/index.md
+++ b/docs/user-guide/downward-api/volume/index.md
@@ -1,4 +1,5 @@
 ---
+title: Downward API Volumes
 ---
 
 Following this example, you will create a pod with a downward API volume.
diff --git a/docs/user-guide/environment-guide/index.md b/docs/user-guide/environment-guide/index.md
index 09657be4fc..64f1e4a019 100644
--- a/docs/user-guide/environment-guide/index.md
+++ b/docs/user-guide/environment-guide/index.md
@@ -1,9 +1,9 @@
----
-assignees:
-- mikedanese
-
----
-
+---
+assignees:
+- mikedanese
+title: Using Environment Variables
+---
+
 This example demonstrates running pods, replication controllers, and
 services. It shows two types of pods: frontend and backend, with
 services on top of both. Accessing the frontend pod will return
diff --git a/docs/user-guide/federation/configmap.md b/docs/user-guide/federation/configmap.md
index 277e6af5cf..93c9e75f55 100644
--- a/docs/user-guide/federation/configmap.md
+++ b/docs/user-guide/federation/configmap.md
@@ -1,4 +1,5 @@
 ---
+title: Federated ConfigMap
 ---
 
 This guide explains how to use ConfigMaps in a Federation control plane.
diff --git a/docs/user-guide/federation/daemonsets.md b/docs/user-guide/federation/daemonsets.md
index 8d9472306d..069afd7ac8 100644
--- a/docs/user-guide/federation/daemonsets.md
+++ b/docs/user-guide/federation/daemonsets.md
@@ -1,4 +1,5 @@
 ---
+title: Federated DaemonSet
 ---
 
 This guide explains how to use DaemonSets in a federation control plane.
diff --git a/docs/user-guide/federation/deployment.md b/docs/user-guide/federation/deployment.md
index fea7f42e76..b8a47f0a63 100644
--- a/docs/user-guide/federation/deployment.md
+++ b/docs/user-guide/federation/deployment.md
@@ -1,4 +1,5 @@
 ---
+title: Federated Deployment
 ---
 
 This guide explains how to use Deployments in the Federation control plane.
diff --git a/docs/user-guide/federation/events.md b/docs/user-guide/federation/events.md
index a7e2a44a17..f1f8868466 100644
--- a/docs/user-guide/federation/events.md
+++ b/docs/user-guide/federation/events.md
@@ -1,4 +1,5 @@
 ---
+title: Federated Events
 ---
 
 This guide explains how to use events in federation control plane to help in debugging.
diff --git a/docs/user-guide/federation/federated-ingress.md b/docs/user-guide/federation/federated-ingress.md
index 841dd66705..ff7638481e 100644
--- a/docs/user-guide/federation/federated-ingress.md
+++ b/docs/user-guide/federation/federated-ingress.md
@@ -1,4 +1,5 @@
 ---
+title: Federated Ingress
 ---
 
 This guide explains how to use Kubernetes Federated Ingress to deploy
diff --git a/docs/user-guide/federation/federated-services.md b/docs/user-guide/federation/federated-services.md
index 18c26d4014..354fbeca01 100644
--- a/docs/user-guide/federation/federated-services.md
+++ b/docs/user-guide/federation/federated-services.md
@@ -2,7 +2,7 @@
 assignees:
 - bprashanth
 - quinton-hoole
-
+title: Cross-cluster Service Discovery using Federated Services
 ---
 
 This guide explains how to use Kubernetes Federated Services to deploy
diff --git a/docs/user-guide/federation/index.md b/docs/user-guide/federation/index.md
index f30a5c6c64..0c54a2c922 100644
--- a/docs/user-guide/federation/index.md
+++ b/docs/user-guide/federation/index.md
@@ -1,4 +1,5 @@
 ---
+title: Federation User Guide
 ---
 
 This guide explains how we can manage multiple kubernetes clusters using
diff --git a/docs/user-guide/federation/namespaces.md b/docs/user-guide/federation/namespaces.md
index a64f6d0db6..9090f2a4ec 100644
--- a/docs/user-guide/federation/namespaces.md
+++ b/docs/user-guide/federation/namespaces.md
@@ -1,4 +1,5 @@
 ---
+title: Federated Namespaces
 ---
 
 This guide explains how to use namespaces in Federation control plane.
diff --git a/docs/user-guide/federation/replicasets.md b/docs/user-guide/federation/replicasets.md
index d0ceaa8bde..c1213e9f32 100644
--- a/docs/user-guide/federation/replicasets.md
+++ b/docs/user-guide/federation/replicasets.md
@@ -1,4 +1,5 @@
 ---
+title: Federated ReplicaSets
 ---
 
 This guide explains how to use replica sets in the Federation control plane.
diff --git a/docs/user-guide/federation/secrets.md b/docs/user-guide/federation/secrets.md
index b796dba56f..372ed30bfd 100644
--- a/docs/user-guide/federation/secrets.md
+++ b/docs/user-guide/federation/secrets.md
@@ -1,4 +1,5 @@
 ---
+title: Federated Secrets
 ---
 
 This guide explains how to use secrets in Federation control plane.
diff --git a/docs/user-guide/garbage-collection.md b/docs/user-guide/garbage-collection.md
index bcf58c7f9d..fe55949f1f 100644
--- a/docs/user-guide/garbage-collection.md
+++ b/docs/user-guide/garbage-collection.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - caesarxuchao
-
+title: Garbage Collection (Beta)
 ---
 
 * TOC
diff --git a/docs/user-guide/getting-into-containers.md b/docs/user-guide/getting-into-containers.md
index f45da7b0eb..bf6a5a8a2f 100644
--- a/docs/user-guide/getting-into-containers.md
+++ b/docs/user-guide/getting-into-containers.md
@@ -2,7 +2,7 @@
 assignees:
 - caesarxuchao
 - mikedanese
-
+title: Running Commands in a Container with kubectl exec
 ---
 
 Developers can use `kubectl exec` to run commands in a container. This guide demonstrates two use cases.
diff --git a/docs/user-guide/horizontal-pod-autoscaling/index.md b/docs/user-guide/horizontal-pod-autoscaling/index.md
index fbdd11360a..4fb1fa9be7 100644
--- a/docs/user-guide/horizontal-pod-autoscaling/index.md
+++ b/docs/user-guide/horizontal-pod-autoscaling/index.md
@@ -2,7 +2,7 @@
 assignees:
 - fgrzadkowski
 - jszczepkowski
-
+title: Horizontal Pod Autoscaling
 ---
 
 This document describes the current state of Horizontal Pod Autoscaling in Kubernetes.
diff --git a/docs/user-guide/horizontal-pod-autoscaling/walkthrough.md b/docs/user-guide/horizontal-pod-autoscaling/walkthrough.md
index 0f288352a0..af66f7dd8d 100644
--- a/docs/user-guide/horizontal-pod-autoscaling/walkthrough.md
+++ b/docs/user-guide/horizontal-pod-autoscaling/walkthrough.md
@@ -3,7 +3,7 @@ assignees:
 - fgrzadkowski
 - jszczepkowski
 - justinsb
-
+title: Horizontal Pod Autoscaling
 ---
 
 Horizontal Pod Autoscaling automatically scales the number of pods
diff --git a/docs/user-guide/identifiers.md b/docs/user-guide/identifiers.md
index e28bac0e56..195ff57de4 100644
--- a/docs/user-guide/identifiers.md
+++ b/docs/user-guide/identifiers.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Names
 ---
 
 All objects in the Kubernetes REST API are unambiguously identified by a Name and a UID.
diff --git a/docs/user-guide/images.md b/docs/user-guide/images.md
index 582961593f..e6cdd9e734 100644
--- a/docs/user-guide/images.md
+++ b/docs/user-guide/images.md
@@ -2,7 +2,7 @@
 assignees:
 - erictune
 - thockin
-
+title: Images
 ---
 
 Each container in a pod has its own image.  Currently, the only type of image supported is a [Docker Image](https://docs.docker.com/engine/tutorials/dockerimages/).
diff --git a/docs/user-guide/index.md b/docs/user-guide/index.md
index 4a4eb3ab54..626ae67f70 100644
--- a/docs/user-guide/index.md
+++ b/docs/user-guide/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - davidopp
-
+title: Guides
 ---
 
 The Kubernetes **Guides** can help you work with various aspects of the Kubernetes system.
diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md
index a8324bea24..c510de1d62 100644
--- a/docs/user-guide/ingress.md
+++ b/docs/user-guide/ingress.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - bprashanth
-
+title: Ingress Resources
 ---
 
 * TOC
diff --git a/docs/user-guide/introspection-and-debugging.md b/docs/user-guide/introspection-and-debugging.md
index 78b1a44862..ab7aaaf67f 100644
--- a/docs/user-guide/introspection-and-debugging.md
+++ b/docs/user-guide/introspection-and-debugging.md
@@ -2,7 +2,7 @@
 assignees:
 - janetkuo
 - thockin
-
+title: Application Introspection and Debugging
 ---
 
 Once your application is running, you'll inevitably need to debug problems with it.
diff --git a/docs/user-guide/jobs.md b/docs/user-guide/jobs.md
index 0d897cbbc9..4e7d20be31 100644
--- a/docs/user-guide/jobs.md
+++ b/docs/user-guide/jobs.md
@@ -2,7 +2,7 @@
 assignees:
 - erictune
 - soltysh
-
+title: Jobs
 ---
 
 * TOC
diff --git a/docs/user-guide/jobs/expansions/index.md b/docs/user-guide/jobs/expansions/index.md
index 9dd2786530..70eb90a623 100644
--- a/docs/user-guide/jobs/expansions/index.md
+++ b/docs/user-guide/jobs/expansions/index.md
@@ -1,4 +1,5 @@
 ---
+title: Parallel Processing using Expansions
 ---
 
 * TOC
diff --git a/docs/user-guide/jobs/work-queue-1/index.md b/docs/user-guide/jobs/work-queue-1/index.md
index 9b0735b574..60703a03e3 100644
--- a/docs/user-guide/jobs/work-queue-1/index.md
+++ b/docs/user-guide/jobs/work-queue-1/index.md
@@ -1,4 +1,5 @@
 ---
+title: Coarse Parallel Processing using a Work Queue
 ---
 
 * TOC
diff --git a/docs/user-guide/jobs/work-queue-2/index.md b/docs/user-guide/jobs/work-queue-2/index.md
index fc31850c91..98d327d9a9 100644
--- a/docs/user-guide/jobs/work-queue-2/index.md
+++ b/docs/user-guide/jobs/work-queue-2/index.md
@@ -1,4 +1,5 @@
 ---
+title: Fine Parallel Processing using a Work Queue
 ---
 
 * TOC
diff --git a/docs/user-guide/jsonpath.md b/docs/user-guide/jsonpath.md
index 01a3e1d03c..74ce7bbc77 100644
--- a/docs/user-guide/jsonpath.md
+++ b/docs/user-guide/jsonpath.md
@@ -1,5 +1,5 @@
 ---
-
+title: JSONpath Support
 ---
 
 JSONPath template is composed of JSONPath expressions enclosed by {}.
diff --git a/docs/user-guide/kubeconfig-file.md b/docs/user-guide/kubeconfig-file.md
index 3db16e17de..3f861ef2d2 100644
--- a/docs/user-guide/kubeconfig-file.md
+++ b/docs/user-guide/kubeconfig-file.md
@@ -1,10 +1,10 @@
----
-assignees:
-- mikedanese
-- thockin
-
----
-
+---
+assignees:
+- mikedanese
+- thockin
+title: Authenticating Across Clusters with kubeconfig
+---
+
 Authentication in kubernetes can differ for different individuals.
 
 - A running kubelet might have one way of authenticating (i.e. certificates).
diff --git a/docs/user-guide/kubectl-cheatsheet.md b/docs/user-guide/kubectl-cheatsheet.md
index 3a1148c00c..56c4660f18 100644
--- a/docs/user-guide/kubectl-cheatsheet.md
+++ b/docs/user-guide/kubectl-cheatsheet.md
@@ -4,7 +4,7 @@ assignees:
 - erictune
 - krousey
 - clove
-
+title: kubectl Cheat Sheet
 ---
 
 See also: [Kubectl Overview](/docs/user-guide/kubectl-overview/) and [JsonPath Guide](/docs/user-guide/jsonpath).
diff --git a/docs/user-guide/kubectl-conventions.md b/docs/user-guide/kubectl-conventions.md
index ad2522f663..fb0c467321 100644
--- a/docs/user-guide/kubectl-conventions.md
+++ b/docs/user-guide/kubectl-conventions.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - janetkuo
-
+title: kubectl Usage Conventions
 ---
 
 * TOC
diff --git a/docs/user-guide/kubectl-overview.md b/docs/user-guide/kubectl-overview.md
index cc08e47c68..c90efb125d 100644
--- a/docs/user-guide/kubectl-overview.md
+++ b/docs/user-guide/kubectl-overview.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - hw-qiaolei
-
+title: kubectl Overview
 ---
 
 `kubectl` is a command line interface for running commands against Kubernetes clusters. This overview covers `kubectl` syntax, describes the command operations, and provides common examples. For details about each command, including all the supported flags and subcommands, see the [kubectl](/docs/user-guide/kubectl) reference documentation. For installation instructions see [prerequisites](/docs/user-guide/prereqs).
diff --git a/docs/user-guide/kubectl/index.md b/docs/user-guide/kubectl/index.md
index 1c5a55dda4..75fc6c06bf 100644
--- a/docs/user-guide/kubectl/index.md
+++ b/docs/user-guide/kubectl/index.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl
 ---
+
 ## kubectl
 
 kubectl controls the Kubernetes cluster manager
diff --git a/docs/user-guide/kubectl/kubectl_annotate.md b/docs/user-guide/kubectl/kubectl_annotate.md
index 4a948a0827..07f2bc5c52 100644
--- a/docs/user-guide/kubectl/kubectl_annotate.md
+++ b/docs/user-guide/kubectl/kubectl_annotate.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl annotate
 ---
+
 ## kubectl annotate
 
 Update the annotations on a resource
diff --git a/docs/user-guide/kubectl/kubectl_api-versions.md b/docs/user-guide/kubectl/kubectl_api-versions.md
index 60b7472d63..cc79a82059 100644
--- a/docs/user-guide/kubectl/kubectl_api-versions.md
+++ b/docs/user-guide/kubectl/kubectl_api-versions.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl api-versions
 ---
+
 ## kubectl api-versions
 
 Print the supported API versions on the server, in the form of "group/version"
diff --git a/docs/user-guide/kubectl/kubectl_apply.md b/docs/user-guide/kubectl/kubectl_apply.md
index ab00698a74..c729263d6c 100644
--- a/docs/user-guide/kubectl/kubectl_apply.md
+++ b/docs/user-guide/kubectl/kubectl_apply.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl apply
 ---
+
 ## kubectl apply
 
 Apply a configuration to a resource by filename or stdin
diff --git a/docs/user-guide/kubectl/kubectl_attach.md b/docs/user-guide/kubectl/kubectl_attach.md
index fa40d04eb9..f19e557fc9 100644
--- a/docs/user-guide/kubectl/kubectl_attach.md
+++ b/docs/user-guide/kubectl/kubectl_attach.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl attach
 ---
+
 ## kubectl attach
 
 Attach to a running container
diff --git a/docs/user-guide/kubectl/kubectl_autoscale.md b/docs/user-guide/kubectl/kubectl_autoscale.md
index 766905cadf..d996c94d72 100644
--- a/docs/user-guide/kubectl/kubectl_autoscale.md
+++ b/docs/user-guide/kubectl/kubectl_autoscale.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl autoscale
 ---
+
 ## kubectl autoscale
 
 Auto-scale a Deployment, ReplicaSet, or ReplicationController
diff --git a/docs/user-guide/kubectl/kubectl_cluster-info.md b/docs/user-guide/kubectl/kubectl_cluster-info.md
index 3f7ee8df45..46823b69f8 100644
--- a/docs/user-guide/kubectl/kubectl_cluster-info.md
+++ b/docs/user-guide/kubectl/kubectl_cluster-info.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl cluster-info
 ---
+
 ## kubectl cluster-info
 
 Display cluster info
diff --git a/docs/user-guide/kubectl/kubectl_config.md b/docs/user-guide/kubectl/kubectl_config.md
index ac8ff3d3cf..441db2334a 100644
--- a/docs/user-guide/kubectl/kubectl_config.md
+++ b/docs/user-guide/kubectl/kubectl_config.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config
 ---
+
 ## kubectl config
 
 Modify kubeconfig files
diff --git a/docs/user-guide/kubectl/kubectl_config_current-context.md b/docs/user-guide/kubectl/kubectl_config_current-context.md
index f63bbf9565..0257ce6b58 100644
--- a/docs/user-guide/kubectl/kubectl_config_current-context.md
+++ b/docs/user-guide/kubectl/kubectl_config_current-context.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config current-context
 ---
+
 ## kubectl config current-context
 
 Displays the current-context
diff --git a/docs/user-guide/kubectl/kubectl_config_set-cluster.md b/docs/user-guide/kubectl/kubectl_config_set-cluster.md
index ea7e6eae54..c835a0d255 100644
--- a/docs/user-guide/kubectl/kubectl_config_set-cluster.md
+++ b/docs/user-guide/kubectl/kubectl_config_set-cluster.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config set-cluster
 ---
+
 ## kubectl config set-cluster
 
 Sets a cluster entry in kubeconfig
diff --git a/docs/user-guide/kubectl/kubectl_config_set-context.md b/docs/user-guide/kubectl/kubectl_config_set-context.md
index 5ac40ec103..9fcdce00c8 100644
--- a/docs/user-guide/kubectl/kubectl_config_set-context.md
+++ b/docs/user-guide/kubectl/kubectl_config_set-context.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config set-context
 ---
+
 ## kubectl config set-context
 
 Sets a context entry in kubeconfig
diff --git a/docs/user-guide/kubectl/kubectl_config_set-credentials.md b/docs/user-guide/kubectl/kubectl_config_set-credentials.md
index 942591872e..31a3907a71 100644
--- a/docs/user-guide/kubectl/kubectl_config_set-credentials.md
+++ b/docs/user-guide/kubectl/kubectl_config_set-credentials.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config set-credentials
 ---
+
 ## kubectl config set-credentials
 
 Sets a user entry in kubeconfig
diff --git a/docs/user-guide/kubectl/kubectl_config_set.md b/docs/user-guide/kubectl/kubectl_config_set.md
index d7f2765191..dc82b45c7f 100644
--- a/docs/user-guide/kubectl/kubectl_config_set.md
+++ b/docs/user-guide/kubectl/kubectl_config_set.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config set
 ---
+
 ## kubectl config set
 
 Sets an individual value in a kubeconfig file
diff --git a/docs/user-guide/kubectl/kubectl_config_unset.md b/docs/user-guide/kubectl/kubectl_config_unset.md
index 13268d8ede..e435fc1f46 100644
--- a/docs/user-guide/kubectl/kubectl_config_unset.md
+++ b/docs/user-guide/kubectl/kubectl_config_unset.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config unset
 ---
+
 ## kubectl config unset
 
 Unsets an individual value in a kubeconfig file
diff --git a/docs/user-guide/kubectl/kubectl_config_use-context.md b/docs/user-guide/kubectl/kubectl_config_use-context.md
index c545771cf4..d87130d583 100644
--- a/docs/user-guide/kubectl/kubectl_config_use-context.md
+++ b/docs/user-guide/kubectl/kubectl_config_use-context.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config use-context
 ---
+
 ## kubectl config use-context
 
 Sets the current-context in a kubeconfig file
diff --git a/docs/user-guide/kubectl/kubectl_config_view.md b/docs/user-guide/kubectl/kubectl_config_view.md
index 9255d43bc0..ef7f6649c1 100644
--- a/docs/user-guide/kubectl/kubectl_config_view.md
+++ b/docs/user-guide/kubectl/kubectl_config_view.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl config view
 ---
+
 ## kubectl config view
 
 Display merged kubeconfig settings or a specified kubeconfig file
diff --git a/docs/user-guide/kubectl/kubectl_convert.md b/docs/user-guide/kubectl/kubectl_convert.md
index 74886a191b..b37b32ff28 100644
--- a/docs/user-guide/kubectl/kubectl_convert.md
+++ b/docs/user-guide/kubectl/kubectl_convert.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl convert
 ---
+
 ## kubectl convert
 
 Convert config files between different API versions
diff --git a/docs/user-guide/kubectl/kubectl_cordon.md b/docs/user-guide/kubectl/kubectl_cordon.md
index fd46f111a0..3ca7782fd4 100644
--- a/docs/user-guide/kubectl/kubectl_cordon.md
+++ b/docs/user-guide/kubectl/kubectl_cordon.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl cordon
 ---
+
 ## kubectl cordon
 
 Mark node as unschedulable
diff --git a/docs/user-guide/kubectl/kubectl_create.md b/docs/user-guide/kubectl/kubectl_create.md
index 73ab19c6f7..abadda07f6 100644
--- a/docs/user-guide/kubectl/kubectl_create.md
+++ b/docs/user-guide/kubectl/kubectl_create.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create
 ---
+
 ## kubectl create
 
 Create a resource by filename or stdin
diff --git a/docs/user-guide/kubectl/kubectl_create_configmap.md b/docs/user-guide/kubectl/kubectl_create_configmap.md
index 6c92dd350e..d5d147b465 100644
--- a/docs/user-guide/kubectl/kubectl_create_configmap.md
+++ b/docs/user-guide/kubectl/kubectl_create_configmap.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create configmap
 ---
+
 ## kubectl create configmap
 
 Create a configmap from a local file, directory or literal value
diff --git a/docs/user-guide/kubectl/kubectl_create_namespace.md b/docs/user-guide/kubectl/kubectl_create_namespace.md
index dc7caf0b06..4d90219754 100644
--- a/docs/user-guide/kubectl/kubectl_create_namespace.md
+++ b/docs/user-guide/kubectl/kubectl_create_namespace.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create namespace
 ---
+
 ## kubectl create namespace
 
 Create a namespace with the specified name
diff --git a/docs/user-guide/kubectl/kubectl_create_secret.md b/docs/user-guide/kubectl/kubectl_create_secret.md
index 5781e645f8..965bb16832 100644
--- a/docs/user-guide/kubectl/kubectl_create_secret.md
+++ b/docs/user-guide/kubectl/kubectl_create_secret.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create secret
 ---
+
 ## kubectl create secret
 
 Create a secret using specified subcommand
diff --git a/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md b/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md
index 205c95d994..fa37d3fd48 100644
--- a/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md
+++ b/docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create secret docker-registry
 ---
+
 ## kubectl create secret docker-registry
 
 Create a secret for use with a Docker registry
diff --git a/docs/user-guide/kubectl/kubectl_create_secret_generic.md b/docs/user-guide/kubectl/kubectl_create_secret_generic.md
index 67c3a5004d..4bddfad2b1 100644
--- a/docs/user-guide/kubectl/kubectl_create_secret_generic.md
+++ b/docs/user-guide/kubectl/kubectl_create_secret_generic.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create secret generic
 ---
+
 ## kubectl create secret generic
 
 Create a secret from a local file, directory or literal value
diff --git a/docs/user-guide/kubectl/kubectl_create_serviceaccount.md b/docs/user-guide/kubectl/kubectl_create_serviceaccount.md
index d4de8e3bbc..3deab7f566 100644
--- a/docs/user-guide/kubectl/kubectl_create_serviceaccount.md
+++ b/docs/user-guide/kubectl/kubectl_create_serviceaccount.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl create serviceaccount
 ---
+
 ## kubectl create serviceaccount
 
 Create a service account with the specified name
diff --git a/docs/user-guide/kubectl/kubectl_delete.md b/docs/user-guide/kubectl/kubectl_delete.md
index b14d88b49d..ddca437942 100644
--- a/docs/user-guide/kubectl/kubectl_delete.md
+++ b/docs/user-guide/kubectl/kubectl_delete.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl delete
 ---
+
 ## kubectl delete
 
 Delete resources by filenames, stdin, resources and names, or by resources and label selector
diff --git a/docs/user-guide/kubectl/kubectl_describe.md b/docs/user-guide/kubectl/kubectl_describe.md
index e6b498bb04..a5fd703d73 100644
--- a/docs/user-guide/kubectl/kubectl_describe.md
+++ b/docs/user-guide/kubectl/kubectl_describe.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl describe
 ---
+
 ## kubectl describe
 
 Show details of a specific resource or group of resources
diff --git a/docs/user-guide/kubectl/kubectl_drain.md b/docs/user-guide/kubectl/kubectl_drain.md
index bf4bdeda8e..712af40af7 100644
--- a/docs/user-guide/kubectl/kubectl_drain.md
+++ b/docs/user-guide/kubectl/kubectl_drain.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl drain
 ---
+
 ## kubectl drain
 
 Drain node in preparation for maintenance
diff --git a/docs/user-guide/kubectl/kubectl_edit.md b/docs/user-guide/kubectl/kubectl_edit.md
index 065c1bf173..bff3f7cd67 100644
--- a/docs/user-guide/kubectl/kubectl_edit.md
+++ b/docs/user-guide/kubectl/kubectl_edit.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl edit
 ---
+
 ## kubectl edit
 
 Edit a resource on the server
diff --git a/docs/user-guide/kubectl/kubectl_exec.md b/docs/user-guide/kubectl/kubectl_exec.md
index 9791da62b3..8a64cd7bcf 100644
--- a/docs/user-guide/kubectl/kubectl_exec.md
+++ b/docs/user-guide/kubectl/kubectl_exec.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl exec
 ---
+
 ## kubectl exec
 
 Execute a command in a container
diff --git a/docs/user-guide/kubectl/kubectl_explain.md b/docs/user-guide/kubectl/kubectl_explain.md
index 67b8f7cfde..60523fdc9f 100644
--- a/docs/user-guide/kubectl/kubectl_explain.md
+++ b/docs/user-guide/kubectl/kubectl_explain.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl explain
 ---
+
 ## kubectl explain
 
 Documentation of resources
diff --git a/docs/user-guide/kubectl/kubectl_expose.md b/docs/user-guide/kubectl/kubectl_expose.md
index ef602103d2..f741313c29 100644
--- a/docs/user-guide/kubectl/kubectl_expose.md
+++ b/docs/user-guide/kubectl/kubectl_expose.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl expose
 ---
+
 ## kubectl expose
 
 Take a replication controller, service, deployment or pod and expose it as a new Kubernetes Service
diff --git a/docs/user-guide/kubectl/kubectl_get.md b/docs/user-guide/kubectl/kubectl_get.md
index a0d5bd83de..4fea746b61 100644
--- a/docs/user-guide/kubectl/kubectl_get.md
+++ b/docs/user-guide/kubectl/kubectl_get.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl get
 ---
+
 ## kubectl get
 
 Display one or many resources
diff --git a/docs/user-guide/kubectl/kubectl_label.md b/docs/user-guide/kubectl/kubectl_label.md
index 556fa6cc5b..be186a6515 100644
--- a/docs/user-guide/kubectl/kubectl_label.md
+++ b/docs/user-guide/kubectl/kubectl_label.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl label
 ---
+
 ## kubectl label
 
 Update the labels on a resource
diff --git a/docs/user-guide/kubectl/kubectl_logs.md b/docs/user-guide/kubectl/kubectl_logs.md
index 214a2e29a8..cfc418eb59 100644
--- a/docs/user-guide/kubectl/kubectl_logs.md
+++ b/docs/user-guide/kubectl/kubectl_logs.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl logs
 ---
+
 ## kubectl logs
 
 Print the logs for a container in a pod
diff --git a/docs/user-guide/kubectl/kubectl_patch.md b/docs/user-guide/kubectl/kubectl_patch.md
index 87136c6b9c..fb6c4299ad 100644
--- a/docs/user-guide/kubectl/kubectl_patch.md
+++ b/docs/user-guide/kubectl/kubectl_patch.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl patch
 ---
+
 ## kubectl patch
 
 Update field(s) of a resource using strategic merge patch
diff --git a/docs/user-guide/kubectl/kubectl_port-forward.md b/docs/user-guide/kubectl/kubectl_port-forward.md
index 436f624783..feb00cf258 100644
--- a/docs/user-guide/kubectl/kubectl_port-forward.md
+++ b/docs/user-guide/kubectl/kubectl_port-forward.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl port-forward
 ---
+
 ## kubectl port-forward
 
 Forward one or more local ports to a pod
diff --git a/docs/user-guide/kubectl/kubectl_proxy.md b/docs/user-guide/kubectl/kubectl_proxy.md
index c6fafa2119..d3713ae52f 100644
--- a/docs/user-guide/kubectl/kubectl_proxy.md
+++ b/docs/user-guide/kubectl/kubectl_proxy.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl proxy
 ---
+
 ## kubectl proxy
 
 Run a proxy to the Kubernetes API server
diff --git a/docs/user-guide/kubectl/kubectl_replace.md b/docs/user-guide/kubectl/kubectl_replace.md
index f951aac18d..5e0ee378de 100644
--- a/docs/user-guide/kubectl/kubectl_replace.md
+++ b/docs/user-guide/kubectl/kubectl_replace.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl replace
 ---
+
 ## kubectl replace
 
 Replace a resource by filename or stdin
diff --git a/docs/user-guide/kubectl/kubectl_rolling-update.md b/docs/user-guide/kubectl/kubectl_rolling-update.md
index 0d1784999b..382e630c78 100644
--- a/docs/user-guide/kubectl/kubectl_rolling-update.md
+++ b/docs/user-guide/kubectl/kubectl_rolling-update.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl rolling-update
 ---
+
 ## kubectl rolling-update
 
 Perform a rolling update of the given ReplicationController
diff --git a/docs/user-guide/kubectl/kubectl_rollout.md b/docs/user-guide/kubectl/kubectl_rollout.md
index ddb44ca206..fb8ab9fdd9 100644
--- a/docs/user-guide/kubectl/kubectl_rollout.md
+++ b/docs/user-guide/kubectl/kubectl_rollout.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl rollout
 ---
+
 ## kubectl rollout
 
 Manage a deployment rollout
diff --git a/docs/user-guide/kubectl/kubectl_rollout_history.md b/docs/user-guide/kubectl/kubectl_rollout_history.md
index e514bf2554..440e76de06 100644
--- a/docs/user-guide/kubectl/kubectl_rollout_history.md
+++ b/docs/user-guide/kubectl/kubectl_rollout_history.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl rollout history
 ---
+
 ## kubectl rollout history
 
 View rollout history
diff --git a/docs/user-guide/kubectl/kubectl_rollout_pause.md b/docs/user-guide/kubectl/kubectl_rollout_pause.md
index bf8d281fea..012914c878 100644
--- a/docs/user-guide/kubectl/kubectl_rollout_pause.md
+++ b/docs/user-guide/kubectl/kubectl_rollout_pause.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl rollout pause
 ---
+
 ## kubectl rollout pause
 
 Mark the provided resource as paused
diff --git a/docs/user-guide/kubectl/kubectl_rollout_resume.md b/docs/user-guide/kubectl/kubectl_rollout_resume.md
index d35920ccf4..193a3f0081 100644
--- a/docs/user-guide/kubectl/kubectl_rollout_resume.md
+++ b/docs/user-guide/kubectl/kubectl_rollout_resume.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl rollout resume
 ---
+
 ## kubectl rollout resume
 
 Resume a paused resource
diff --git a/docs/user-guide/kubectl/kubectl_rollout_undo.md b/docs/user-guide/kubectl/kubectl_rollout_undo.md
index 654f17a711..7dcb287be4 100644
--- a/docs/user-guide/kubectl/kubectl_rollout_undo.md
+++ b/docs/user-guide/kubectl/kubectl_rollout_undo.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl rollout undo
 ---
+
 ## kubectl rollout undo
 
 Undo a previous rollout
diff --git a/docs/user-guide/kubectl/kubectl_run.md b/docs/user-guide/kubectl/kubectl_run.md
index dca08d8328..5a468401d3 100644
--- a/docs/user-guide/kubectl/kubectl_run.md
+++ b/docs/user-guide/kubectl/kubectl_run.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl run
 ---
+
 ## kubectl run
 
 Run a particular image on the cluster
diff --git a/docs/user-guide/kubectl/kubectl_scale.md b/docs/user-guide/kubectl/kubectl_scale.md
index 5387f9700a..93e82ac37b 100644
--- a/docs/user-guide/kubectl/kubectl_scale.md
+++ b/docs/user-guide/kubectl/kubectl_scale.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl scale
 ---
+
 ## kubectl scale
 
 Set a new size for a Deployment, ReplicaSet, Replication Controller, or Job
diff --git a/docs/user-guide/kubectl/kubectl_stop.md b/docs/user-guide/kubectl/kubectl_stop.md
index 3017193ede..d11142c7ed 100644
--- a/docs/user-guide/kubectl/kubectl_stop.md
+++ b/docs/user-guide/kubectl/kubectl_stop.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl stop
 ---
+
 ## kubectl stop
 
 Deprecated: Gracefully shut down a resource by name or filename.
diff --git a/docs/user-guide/kubectl/kubectl_uncordon.md b/docs/user-guide/kubectl/kubectl_uncordon.md
index 7041c65407..ce4dcc38ab 100644
--- a/docs/user-guide/kubectl/kubectl_uncordon.md
+++ b/docs/user-guide/kubectl/kubectl_uncordon.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl uncordon
 ---
+
 ## kubectl uncordon
 
 Mark node as schedulable
diff --git a/docs/user-guide/kubectl/kubectl_version.md b/docs/user-guide/kubectl/kubectl_version.md
index af5b41abc3..a86115d790 100644
--- a/docs/user-guide/kubectl/kubectl_version.md
+++ b/docs/user-guide/kubectl/kubectl_version.md
@@ -1,5 +1,7 @@
 ---
+title: kubectl version
 ---
+
 ## kubectl version
 
 Print the client and server version information
diff --git a/docs/user-guide/labels.md b/docs/user-guide/labels.md
index 583af0b806..a13e160089 100644
--- a/docs/user-guide/labels.md
+++ b/docs/user-guide/labels.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Labels and Selectors
 ---
 
 _Labels_ are key/value pairs that are attached to objects, such as pods.
diff --git a/docs/user-guide/liveness/index.md b/docs/user-guide/liveness/index.md
index 44272f28ae..5e77f07768 100644
--- a/docs/user-guide/liveness/index.md
+++ b/docs/user-guide/liveness/index.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Checking Pod Health
 ---
 
 This example shows two types of pod [health checks](/docs/user-guide/production-pods/#liveness-and-readiness-probes-aka-health-checks): HTTP checks and container execution checks.
diff --git a/docs/user-guide/load-balancer.md b/docs/user-guide/load-balancer.md
index 5299029787..d8540d98e5 100644
--- a/docs/user-guide/load-balancer.md
+++ b/docs/user-guide/load-balancer.md
@@ -1,5 +1,5 @@
 ---
-
+title: Creating an External Load Balancer
 ---
 
 * TOC
diff --git a/docs/user-guide/logging.md b/docs/user-guide/logging.md
index d329016c7b..5df73928e0 100644
--- a/docs/user-guide/logging.md
+++ b/docs/user-guide/logging.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Retrieving Logs
 ---
 
 This page is designed to help you use logs to troubleshoot issues with your Kubernetes solution.
diff --git a/docs/user-guide/managing-deployments.md b/docs/user-guide/managing-deployments.md
index a2e32c4b6c..2555e5601c 100644
--- a/docs/user-guide/managing-deployments.md
+++ b/docs/user-guide/managing-deployments.md
@@ -3,8 +3,9 @@ assignees:
 - bgrant0607
 - janetkuo
 - mikedanese
-
+title: Managing Resources
 ---
+
 You've deployed your application and exposed it via a service. Now what? Kubernetes provides a number of tools to help you manage your application deployment, including scaling and updating. Among the features we'll discuss in more depth are [configuration files](/docs/user-guide/configuring-containers/#configuration-in-kubernetes) and [labels](/docs/user-guide/deploying-applications/#labels).
 
 You can find all the files for this example [in our docs
diff --git a/docs/user-guide/monitoring.md b/docs/user-guide/monitoring.md
index 0c5f673708..9bf778124b 100644
--- a/docs/user-guide/monitoring.md
+++ b/docs/user-guide/monitoring.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Resource Usage Monitoring
 ---
 
 Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](/docs/user-guide/pods), [services](/docs/user-guide/services), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/kubernetes/heapster), a project meant to provide a base monitoring platform on Kubernetes.
diff --git a/docs/user-guide/namespaces.md b/docs/user-guide/namespaces.md
index 8fc9ac4735..11c4c1a95d 100644
--- a/docs/user-guide/namespaces.md
+++ b/docs/user-guide/namespaces.md
@@ -3,7 +3,7 @@ assignees:
 - derekwaynecarr
 - mikedanese
 - thockin
-
+title: Namespaces
 ---
 
 Kubernetes supports multiple virtual clusters backed by the same physical cluster.
diff --git a/docs/user-guide/networkpolicies.md b/docs/user-guide/networkpolicies.md
index 7cd7ee0765..1c8575d4ab 100644
--- a/docs/user-guide/networkpolicies.md
+++ b/docs/user-guide/networkpolicies.md
@@ -2,7 +2,7 @@
 assignees:
 - thockin
 - caseydavenport
-
+title: Network Policies
 ---
 
 * TOC
diff --git a/docs/user-guide/node-selection/index.md b/docs/user-guide/node-selection/index.md
index 725848b544..e869432ef0 100644
--- a/docs/user-guide/node-selection/index.md
+++ b/docs/user-guide/node-selection/index.md
@@ -2,7 +2,7 @@
 assignees:
 - davidopp
 - kevin-wangzefeng
-
+title: Assigning Pods to Nodes
 ---
 
 # Constraining pods to run on particular nodes
diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md
index 082722a829..fc4b74b629 100644
--- a/docs/user-guide/persistent-volumes/index.md
+++ b/docs/user-guide/persistent-volumes/index.md
@@ -4,7 +4,7 @@ assignees:
 - mikedanese
 - saad-ali
 - thockin
-
+title: Persistent Volumes
 ---
 
 This document describes the current state of `PersistentVolumes` in Kubernetes.  Familiarity with [volumes](/docs/user-guide/volumes/) is suggested.
diff --git a/docs/user-guide/persistent-volumes/walkthrough.md b/docs/user-guide/persistent-volumes/walkthrough.md
index c82a37f7d0..d1cd6a5812 100644
--- a/docs/user-guide/persistent-volumes/walkthrough.md
+++ b/docs/user-guide/persistent-volumes/walkthrough.md
@@ -2,7 +2,7 @@
 assignees:
 - jsafrane
 - saad-ali
-
+title: Persistent Volumes Walkthrough
 ---
 
 The purpose of this guide is to help you become familiar with [Kubernetes Persistent Volumes](/docs/user-guide/persistent-volumes/).  By the end of the guide, we'll have
diff --git a/docs/user-guide/petset.md b/docs/user-guide/petset.md
index 6c205159bc..3cba1fb31e 100644
--- a/docs/user-guide/petset.md
+++ b/docs/user-guide/petset.md
@@ -7,7 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
-
+title: Pet Sets
 ---
 
 __Warning:__ Starting in Kubernetes version 1.5, PetSet has been renamed to
diff --git a/docs/user-guide/petset/bootstrapping/index.md b/docs/user-guide/petset/bootstrapping/index.md
index 32e1bfed93..de3ccb4bd8 100644
--- a/docs/user-guide/petset/bootstrapping/index.md
+++ b/docs/user-guide/petset/bootstrapping/index.md
@@ -7,6 +7,7 @@ assignees:
 - janetkuo
 - kow3ns
 - smarterclayton
+title: Bootstrapping Pet Sets
 ---
 
 __Warning:__ Starting in Kubernetes version 1.5, PetSet has been renamed to [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets). To use (or continue to use) PetSet in Kubernetes 1.5, you _must_ [migrate](/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/) your existing PetSets to StatefulSets. For information on working with StatefulSet, see the tutorial on [how to run replicated stateful applications](/docs/tutorials/stateful-application/run-replicated-stateful-application).
diff --git a/docs/user-guide/pod-security-policy/index.md b/docs/user-guide/pod-security-policy/index.md
index 6fb1d4cebf..8f5920b19e 100644
--- a/docs/user-guide/pod-security-policy/index.md
+++ b/docs/user-guide/pod-security-policy/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - pweil-
-
+title: Pod Security Policies
 ---
 
 Objects of type `podsecuritypolicy` govern the ability 
diff --git a/docs/user-guide/pod-states.md b/docs/user-guide/pod-states.md
index 8f745e9f56..462f8b65bd 100644
--- a/docs/user-guide/pod-states.md
+++ b/docs/user-guide/pod-states.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: The Lifecycle of a Pod
 ---
 
 Updated: 4/14/2015
diff --git a/docs/user-guide/pods/index.md b/docs/user-guide/pods/index.md
index b8a5b65bcc..c2af648265 100644
--- a/docs/user-guide/pods/index.md
+++ b/docs/user-guide/pods/index.md
@@ -1,6 +1,6 @@
 ---
-assignees:
-
+assignees: 
+title: Pods
 ---
 
 * TOC
diff --git a/docs/user-guide/pods/multi-container.md b/docs/user-guide/pods/multi-container.md
index 6c166af20d..55e0e56f84 100644
--- a/docs/user-guide/pods/multi-container.md
+++ b/docs/user-guide/pods/multi-container.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - janetkuo
-
+title: Creating Multi-Container Pods
 ---
 
 * TOC
diff --git a/docs/user-guide/pods/single-container.md b/docs/user-guide/pods/single-container.md
index 605534acda..1b238be826 100644
--- a/docs/user-guide/pods/single-container.md
+++ b/docs/user-guide/pods/single-container.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - janetkuo
-
+title: Creating Single-Container Pods
 ---
 
 * TOC
diff --git a/docs/user-guide/prereqs.md b/docs/user-guide/prereqs.md
index 1902e3315a..4be0d6a188 100644
--- a/docs/user-guide/prereqs.md
+++ b/docs/user-guide/prereqs.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - mikedanese
-
+title: Installing and Setting up kubectl
 ---
 
 To deploy and manage applications on Kubernetes, you’ll use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/). It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps.
diff --git a/docs/user-guide/production-pods.md b/docs/user-guide/production-pods.md
index e884409b5a..bd3724cc5e 100644
--- a/docs/user-guide/production-pods.md
+++ b/docs/user-guide/production-pods.md
@@ -3,7 +3,7 @@ assignees:
 - bgrant0607
 - janetkuo
 - thockin
-
+title: Working with Containers in Production
 ---
 
 You've seen [how to configure and deploy pods and containers](/docs/user-guide/configuring-containers), using some of the most common configuration parameters. This section dives into additional features that are especially useful for running applications in production.
diff --git a/docs/user-guide/quick-start.md b/docs/user-guide/quick-start.md
index 9e9e59dbd8..913614ac2e 100644
--- a/docs/user-guide/quick-start.md
+++ b/docs/user-guide/quick-start.md
@@ -2,7 +2,7 @@
 assignees:
 - bgrant0607
 - janetkuo
-
+title: Launching, Exposing, and Killing Applications
 ---
 
 This guide will help you get oriented to Kubernetes and running your first containers on the cluster. If you are already familiar with the docker-cli, you can also checkout the docker-cli to kubectl migration guide [here](/docs/user-guide/docker-cli-to-kubectl).
diff --git a/docs/user-guide/replicasets.md b/docs/user-guide/replicasets.md
index cd7f620b15..d740422095 100644
--- a/docs/user-guide/replicasets.md
+++ b/docs/user-guide/replicasets.md
@@ -3,7 +3,7 @@ assignees:
 - Kashomon
 - bprashanth
 - madhusudancs
-
+title: Replica Sets
 ---
 
 * TOC
diff --git a/docs/user-guide/replication-controller/index.md b/docs/user-guide/replication-controller/index.md
index 61263d4994..30561cd241 100644
--- a/docs/user-guide/replication-controller/index.md
+++ b/docs/user-guide/replication-controller/index.md
@@ -2,7 +2,7 @@
 assignees:
 - bprashanth
 - janetkuo
-
+title: Replication Controller
 ---
 
 * TOC
diff --git a/docs/user-guide/replication-controller/operations.md b/docs/user-guide/replication-controller/operations.md
index 1d33f352c2..b3bd6115cc 100644
--- a/docs/user-guide/replication-controller/operations.md
+++ b/docs/user-guide/replication-controller/operations.md
@@ -1,8 +1,9 @@
 ---
 assignees:
 - bprashanth
-
+title: Replication Controller Operations
 ---
+
 * TOC
 {:toc}
 
diff --git a/docs/user-guide/resizing-a-replication-controller.md b/docs/user-guide/resizing-a-replication-controller.md
index 8c3c8dc288..c60ce8e60b 100644
--- a/docs/user-guide/resizing-a-replication-controller.md
+++ b/docs/user-guide/resizing-a-replication-controller.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - bprashanth
-
+title: Resizing a Replication Controller
 ---
 
 To increase or decrease the number of pods under a replication controller's
diff --git a/docs/user-guide/rolling-updates.md b/docs/user-guide/rolling-updates.md
index c9ba5d3d27..6bd3c469c8 100644
--- a/docs/user-guide/rolling-updates.md
+++ b/docs/user-guide/rolling-updates.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - janetkuo
-
+title: Rolling Updates
 ---
 
 * TOC
diff --git a/docs/user-guide/secrets/index.md b/docs/user-guide/secrets/index.md
index c55868f1f1..5995c1fad1 100644
--- a/docs/user-guide/secrets/index.md
+++ b/docs/user-guide/secrets/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Secrets
 ---
 
 Objects of type `secret` are intended to hold sensitive information, such as
diff --git a/docs/user-guide/secrets/walkthrough.md b/docs/user-guide/secrets/walkthrough.md
index 001be6add4..11ca7672df 100644
--- a/docs/user-guide/secrets/walkthrough.md
+++ b/docs/user-guide/secrets/walkthrough.md
@@ -1,6 +1,6 @@
 ---
-assignees:
-
+assignees: 
+title: Secrets Walkthrough
 ---
 
 Following this example, you will create a secret and a [pod](/docs/user-guide/pods/) that consumes that secret in a [volume](/docs/user-guide/volumes/). See [Secrets design document](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/secrets.md) for more information.
diff --git a/docs/user-guide/security-context.md b/docs/user-guide/security-context.md
index 2d5807a449..3d216447ca 100644
--- a/docs/user-guide/security-context.md
+++ b/docs/user-guide/security-context.md
@@ -3,7 +3,7 @@ assignees:
 - erictune
 - mikedanese
 - thockin
-
+title: Security Context
 ---
 
 A security context defines the operating system security settings (uid, gid, capabilities, SELinux role, etc..) applied to a container. See [security context design](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/security_context.md) for more details.
diff --git a/docs/user-guide/service-accounts.md b/docs/user-guide/service-accounts.md
index 1df4635da9..d1129a1983 100644
--- a/docs/user-guide/service-accounts.md
+++ b/docs/user-guide/service-accounts.md
@@ -3,7 +3,7 @@ assignees:
 - bprashanth
 - liggitt
 - thockin
-
+title: Service Accounts
 ---
 
 A service account provides an identity for processes that run in a Pod.
diff --git a/docs/user-guide/services-firewalls.md b/docs/user-guide/services-firewalls.md
index 8755d222a5..0c87cc7598 100644
--- a/docs/user-guide/services-firewalls.md
+++ b/docs/user-guide/services-firewalls.md
@@ -2,7 +2,7 @@
 assignees:
 - bprashanth
 - davidopp
-
+title: Configuring Your Cloud Provider's Firewalls
 ---
 
 Many cloud providers (e.g. Google Compute Engine) define firewalls that help prevent inadvertent
diff --git a/docs/user-guide/services/index.md b/docs/user-guide/services/index.md
index cad2b22328..98d31db137 100644
--- a/docs/user-guide/services/index.md
+++ b/docs/user-guide/services/index.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - bprashanth
-
+title: Services
 ---
 
 Kubernetes [`Pods`](/docs/user-guide/pods) are mortal. They are born and they die, and they
diff --git a/docs/user-guide/services/operations.md b/docs/user-guide/services/operations.md
index 6fa6d61bdd..ffeb3e6d05 100644
--- a/docs/user-guide/services/operations.md
+++ b/docs/user-guide/services/operations.md
@@ -2,8 +2,9 @@
 assignees:
 - bprashanth
 - freehan
-
+title: Service Operations
 ---
+
 * TOC
 {:toc}
 
diff --git a/docs/user-guide/sharing-clusters.md b/docs/user-guide/sharing-clusters.md
index 723f54fa14..c21acca84a 100644
--- a/docs/user-guide/sharing-clusters.md
+++ b/docs/user-guide/sharing-clusters.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Sharing Cluster Access with kubeconfig
 ---
 
 Client access to a running Kubernetes cluster can be shared by copying
diff --git a/docs/user-guide/simple-nginx.md b/docs/user-guide/simple-nginx.md
index 4a40d3df06..eba8702857 100644
--- a/docs/user-guide/simple-nginx.md
+++ b/docs/user-guide/simple-nginx.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - mikedanese
-
+title: Running Your First Containers
 ---
 
 Ok, you've run one of the [getting started guides](/docs/getting-started-guides/) and you have
diff --git a/docs/user-guide/thirdpartyresources.md b/docs/user-guide/thirdpartyresources.md
index a1035d44c4..e76c64e295 100644
--- a/docs/user-guide/thirdpartyresources.md
+++ b/docs/user-guide/thirdpartyresources.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - IanLewis
-
+title: Third Party Resources
 ---
 
 * TOC
diff --git a/docs/user-guide/ui.md b/docs/user-guide/ui.md
index 32e3143b52..20a0e7b3bc 100644
--- a/docs/user-guide/ui.md
+++ b/docs/user-guide/ui.md
@@ -3,10 +3,9 @@ assignees:
 - bryk
 - mikedanese
 - rf232
-
+title: Web UI (Dashboard)
 ---
 
-
 Dashboard is a web-based Kubernetes user interface. You can use Dashboard to deploy containerized applications to a Kubernetes cluster, troubleshoot your containerized application, and manage the cluster itself along with its attendant resources. You can use Dashboard to get an overview of applications running on your cluster, as well as for creating or modifying individual Kubernetes resources (such as Deployments, Jobs, DaemonSets, etc). For example, you can scale a Deployment, initiate a rolling update, restart a pod or deploy new applications using a deploy wizard.
 
 Dashboard also provides information on the state of Kubernetes resources in your cluster, and on any errors that may have occurred.
diff --git a/docs/user-guide/update-demo/index.md b/docs/user-guide/update-demo/index.md
index d51bcffc08..3ecd743855 100644
--- a/docs/user-guide/update-demo/index.md
+++ b/docs/user-guide/update-demo/index.md
@@ -1,11 +1,10 @@
----
-assignees:
-- lavalamp
-- mikedanese
-
----
-
-
+---
+assignees:
+- lavalamp
+- mikedanese
+title: Rolling Update Demo
+---
+
 This example demonstrates the usage of Kubernetes to perform a [rolling update](/docs/user-guide/kubectl/kubectl_rolling-update/) on a running group of [pods](/docs/user-guide/pods/). See [here](/docs/user-guide/managing-deployments/#updating-your-application-without-a-service-outage) to understand why you need a rolling update. Also check [rolling update design document](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/simple-rolling-update.md) for more information.
 
 The files for this example are viewable in [our docs repo
diff --git a/docs/user-guide/volumes.md b/docs/user-guide/volumes.md
index e11f0ca44b..f2b5ff88a0 100644
--- a/docs/user-guide/volumes.md
+++ b/docs/user-guide/volumes.md
@@ -4,7 +4,7 @@ assignees:
 - mikedanese
 - saad-ali
 - thockin
-
+title: Volumes
 ---
 
 On-disk files in a container are ephemeral, which presents some problems for
diff --git a/docs/user-guide/working-with-resources.md b/docs/user-guide/working-with-resources.md
index d2aeeb621e..07a9bd55b7 100644
--- a/docs/user-guide/working-with-resources.md
+++ b/docs/user-guide/working-with-resources.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-
+title: Using kubectl to Manage Resources
 ---
 
 *This document is aimed at users who have worked through some of the examples,
diff --git a/docs/whatisk8s.md b/docs/whatisk8s.md
index ca398edf58..7c1e637b6d 100644
--- a/docs/whatisk8s.md
+++ b/docs/whatisk8s.md
@@ -2,10 +2,9 @@
 assignees:
 - bgrant0607
 - mikedanese
-
+title: What is Kubernetes?
 ---
 
-
 Kubernetes is an [open-source platform for automating deployment, scaling, and operations of application containers](http://www.slideshare.net/BrianGrant11/wso2con-us-2015-kubernetes-a-platform-for-automating-deployment-scaling-and-operations) across clusters of hosts, providing container-centric infrastructure.
 
 With Kubernetes, you are able to quickly and efficiently respond to customer demand:
diff --git a/editdocs.md b/editdocs.md
index 1553e80aab..b089db1c43 100644
--- a/editdocs.md
+++ b/editdocs.md
@@ -1,5 +1,6 @@
 ---
 layout: docwithnav
+title: Contributing to the Kubernetes Documentation
 ---
 
 <!-- BEGIN: Gotta keep this section JS/HTML because it swaps out content dynamically -->
diff --git a/kubernetes/third_party/swagger-ui/index.md b/kubernetes/third_party/swagger-ui/index.md
index c481f993f3..425a061477 100644
--- a/kubernetes/third_party/swagger-ui/index.md
+++ b/kubernetes/third_party/swagger-ui/index.md
@@ -1,3 +1,7 @@
+---
+title: Kubernetes API Swagger Spec
+---
+
 ---
 
 Kubernetes swagger UI has now been replaced by our generated API reference docs

From 668e1a27ddfae0f7485d8be41f3e43ceeb9da022 Mon Sep 17 00:00:00 2001
From: gunjan5 <patelgunjan5@gmail.com>
Date: Thu, 15 Dec 2016 13:25:49 -0800
Subject: [PATCH 2/9] Update Calico docs link

---
 docs/admin/addons.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/admin/addons.md b/docs/admin/addons.md
index 1555f8263c..e91ba6e661 100644
--- a/docs/admin/addons.md
+++ b/docs/admin/addons.md
@@ -11,7 +11,7 @@ Add-ons in each section are sorted alphabetically - the ordering does not imply
 
 ## Networking and Network Policy
 
-* [Calico](http://docs.projectcalico.org/v1.6/getting-started/kubernetes/installation/hosted/) is a secure L3 networking and network policy provider.
+* [Calico](http://docs.projectcalico.org/v2.0/getting-started/kubernetes/installation/hosted/) is a secure L3 networking and network policy provider.
 * [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm) unites Flannel and Calico, providing networking and network policy.
 * [Flannel](https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel.yml) is a overlay network provider that can be used with Kubernetes.
 * [Romana](http://romana.io) is a Layer 3 networking solution for pod networks that also supports the [NetworkPolicy API](/docs/user-guide/networkpolicies/). Kubeadm add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize).

From b301f4ad3a6f737d06f8653abc6b059bb179206d Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 15 Dec 2016 17:06:04 -0500
Subject: [PATCH 3/9] add notitle attribute to pages that shouldnt have a title

---
 docs/admin/federation-apiserver.md          | 1 +
 docs/admin/federation-controller-manager.md | 1 +
 docs/admin/kube-apiserver.md                | 1 +
 docs/admin/kube-controller-manager.md       | 1 +
 docs/admin/kube-proxy.md                    | 1 +
 docs/admin/kube-scheduler.md                | 1 +
 docs/admin/kubelet.md                       | 1 +
 7 files changed, 7 insertions(+)

diff --git a/docs/admin/federation-apiserver.md b/docs/admin/federation-apiserver.md
index 77b066854c..72d71547c7 100644
--- a/docs/admin/federation-apiserver.md
+++ b/docs/admin/federation-apiserver.md
@@ -1,5 +1,6 @@
 ---
 title: federation-apiserver
+notitle: true
 ---
 
 ## federation-apiserver
diff --git a/docs/admin/federation-controller-manager.md b/docs/admin/federation-controller-manager.md
index 5e87fce3d0..d3dca5bf06 100644
--- a/docs/admin/federation-controller-manager.md
+++ b/docs/admin/federation-controller-manager.md
@@ -1,5 +1,6 @@
 ---
 title: federation-controller-mananger
+notitle: true
 ---
 
 ## federation-controller-manager
diff --git a/docs/admin/kube-apiserver.md b/docs/admin/kube-apiserver.md
index e8142fac4e..bc08ef1f0a 100644
--- a/docs/admin/kube-apiserver.md
+++ b/docs/admin/kube-apiserver.md
@@ -1,5 +1,6 @@
 ---
 title: kube-apiserver
+notitle: true
 ---
 
 ## kube-apiserver
diff --git a/docs/admin/kube-controller-manager.md b/docs/admin/kube-controller-manager.md
index 5dab0da7e2..f6f11c5f37 100644
--- a/docs/admin/kube-controller-manager.md
+++ b/docs/admin/kube-controller-manager.md
@@ -1,5 +1,6 @@
 ---
 title: kube-controller-manager
+notitle: true
 ---
 
 ## kube-controller-manager
diff --git a/docs/admin/kube-proxy.md b/docs/admin/kube-proxy.md
index f643748624..31d3263b5d 100644
--- a/docs/admin/kube-proxy.md
+++ b/docs/admin/kube-proxy.md
@@ -1,5 +1,6 @@
 ---
 title: kube-proxy
+notitle: true
 ---
 
 ## kube-proxy
diff --git a/docs/admin/kube-scheduler.md b/docs/admin/kube-scheduler.md
index bb6799bb73..6d3b8c9f64 100644
--- a/docs/admin/kube-scheduler.md
+++ b/docs/admin/kube-scheduler.md
@@ -1,5 +1,6 @@
 ---
 title: kube-scheduler
+notitle: true
 ---
 
 ## kube-scheduler
diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md
index 74186eb1ba..b272f869ab 100644
--- a/docs/admin/kubelet.md
+++ b/docs/admin/kubelet.md
@@ -1,5 +1,6 @@
 ---
 title: Overview
+notitle: true
 ---
 
 ## kubelet

From 030e6f230cacc47c519bcfa2c5878243cbe6473c Mon Sep 17 00:00:00 2001
From: Drinky Pool <pu.junqi@zte.com.cn>
Date: Mon, 19 Dec 2016 16:57:08 +0800
Subject: [PATCH 4/9] delete the question mark

1. add "been" right before restarted.
2. delete the question mark at the end of the sentence.
---
 docs/user-guide/introspection-and-debugging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user-guide/introspection-and-debugging.md b/docs/user-guide/introspection-and-debugging.md
index 78b1a44862..3bf39a32bf 100644
--- a/docs/user-guide/introspection-and-debugging.md
+++ b/docs/user-guide/introspection-and-debugging.md
@@ -108,7 +108,7 @@ The container state is one of Waiting, Running, or Terminated. Depending on the
 
 Ready tells you whether the container passed its last readiness probe. (In this case, the container does not have a readiness probe configured; the container is assumed to be ready if no readiness probe is configured.)
 
-Restart Count tells you how many times the container has restarted; this information can be useful for detecting crash loops in containers that are configured with a restart policy of 'always.'?
+Restart Count tells you how many times the container has been restarted; this information can be useful for detecting crash loops in containers that are configured with a restart policy of 'always.'
 
 Currently the only Condition associated with a Pod is the binary Ready condition, which indicates that the pod is able to service requests and should be added to the load balancing pools of all matching services.
 

From d8d99a171e577b27c4fe5bcc3ee3a107dd4490ba Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Mon, 19 Dec 2016 15:08:54 -0500
Subject: [PATCH 5/9] use in-page titles to generate sidebar nav

---
 Gemfile                                |   1 +
 Gemfile.lock                           |   3 +
 _config.yml                            |  13 +
 _data/concepts.yml                     |   9 +-
 _data/docs-home.yml                    |   3 +-
 _data/guides.yml                       | 372 +++++++++----------------
 _data/reference.yml                    | 354 ++++++++---------------
 _data/samples.yml                      |   6 +-
 _data/support.yml                      |  42 +--
 _data/tasks.yml                        |  57 ++--
 _data/tools.yml                        |   3 +-
 _data/tutorials.yml                    |  63 ++---
 _includes/head-header.html             |   1 -
 _includes/tocsearch.html               |  16 +-
 _includes/tree.html                    |  32 ++-
 _layouts/docwithnav.html               |  64 +++--
 docs/user-guide/index.md               |   4 +-
 docs/user-guide/kubectl/kubectl_get.md |  16 +-
 18 files changed, 409 insertions(+), 650 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0c8671cdee..3a9bc43ce1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gem "github-pages", group: :jekyll_plugins
+gem "jekyll-include-cache"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4d72be803d..cd6d47a90f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,6 +86,8 @@ GEM
     jekyll-github-metadata (2.2.0)
       jekyll (~> 3.1)
       octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.1.0)
+      jekyll (~> 3.3)
     jekyll-mentions (1.2.0)
       activesupport (~> 4.0)
       html-pipeline (~> 2.3)
@@ -159,6 +161,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
+  jekyll-include-cache
 
 BUNDLED WITH
    1.13.6
diff --git a/_config.yml b/_config.yml
index 8b131eb433..d8aab803b3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -34,8 +34,21 @@ gems:
   - jekyll-feed
   - jekyll-sitemap
   - jekyll-seo-tag
+  - jekyll-include-cache
 
 # SEO
 logo: /images/favicon.png
 twitter:
   username: kubernetesio
+
+# Tables of contents, stored in the _data folder, that control the sidebar nav
+tocs:
+  - docs-home
+  - guides
+  - tutorials
+  - tasks
+  - concepts
+  - reference
+  - tools
+  - samples
+  - support
diff --git a/_data/concepts.yml b/_data/concepts.yml
index 93c790c0ab..a9a7c3eb29 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -1,13 +1,10 @@
 bigheader: "Concepts"
 abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
 toc:
-- title: Concepts
-  path: /docs/concepts/
+- docs/concepts/index.md
 - title: Object Metadata
   section:
-  - title: Annotations
-    path: /docs/concepts/object-metadata/annotations/
+  - docs/concepts/object-metadata/annotations.md
 - title: Controllers
   section:
-  - title: StatefulSets
-    path: /docs/concepts/abstractions/controllers/statefulsets/
+  - docs/concepts/abstractions/controllers/statefulsets.md
diff --git a/_data/docs-home.yml b/_data/docs-home.yml
index 1cb8c9b05a..b80c025d5e 100644
--- a/_data/docs-home.yml
+++ b/_data/docs-home.yml
@@ -1,5 +1,4 @@
 bigheader: "Kubernetes Documentation"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
-- title: Kubernetes Documentation
-  path: /docs/
+- docs/index.md
diff --git a/_data/guides.yml b/_data/guides.yml
index 583deaeedd..179be261d7 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -1,311 +1,187 @@
 bigheader: "Guides"
 abstract: "How to get started, and accomplish tasks, using Kubernetes."
 toc:
-- title: Guides
-  path: /docs/user-guide/
+- docs/user-guide/index.md
 
 - title: Getting Started
   section:
-  - title: What is Kubernetes?
-    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
-    path: /docs/getting-started-guides/kubectl/
-  - title: Downloading or Building Kubernetes
-    path: /docs/getting-started-guides/binary_release/
+  - docs/whatisk8s.md
+  - docs/getting-started-guides/kubeadm.md
+  - docs/getting-started-guides/kops.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
 
 - title: Accessing the Cluster
   section:
-  - title: Installing and Setting up kubectl
-    path: /docs/user-guide/prereqs/
-  - title: Accessing Clusters
-    path: /docs/user-guide/accessing-the-cluster/
-  - title: Sharing Cluster Access with kubeconfig
-    path: /docs/user-guide/sharing-clusters/
-  - title: Authenticating Across Clusters with kubeconfig
-    path: /docs/user-guide/kubeconfig-file/
+  - docs/user-guide/prereqs.md
+  - docs/user-guide/accessing-the-cluster.md
+  - docs/user-guide/sharing-clusters.md
+  - docs/user-guide/kubeconfig-file.md
 
-- title: User Guide
-  path: /docs/user-guide/
+- docs/user-guide/index.md
 
-- title: Web UI (Dashboard)
-  path: /docs/user-guide/ui/
+- docs/user-guide/ui.md
 
 - title: Workload Deployment and Management
   section:
-  - title: Launching, Exposing, and Killing Applications
-    path: /docs/user-guide/quick-start/
-  - title: Deploying Applications
-    path: /docs/user-guide/deploying-applications/
-  - title: Managing Resources
-    path: /docs/user-guide/managing-deployments/
-  - title: Replication Controller Operations
-    path: /docs/user-guide/replication-controller/operations/
-  - title: Resizing a Replication Controller
-    path: /docs/user-guide/resizing-a-replication-controller/
-  - title: Rolling Updates
-    path: /docs/user-guide/rolling-updates/
-  - title: Rolling Update Demo
-    path: /docs/user-guide/update-demo/
-  - title: Secrets Walkthrough
-    path: /docs/user-guide/secrets/walkthrough/
-  - title: Using ConfigMap
-    path: /docs/user-guide/configmap/
-  - title: Horizontal Pod Autoscaling
-    path: /docs/user-guide/horizontal-pod-autoscaling/walkthrough/
-  - title: Best Practices for Configuration
-    path: /docs/user-guide/config-best-practices/
-  - title: Using kubectl to Manage Resources
-    path: /docs/user-guide/working-with-resources/
-  - title: Garbage Collection (Beta)
-    path: /docs/user-guide/garbage-collection/
+  - docs/user-guide/quick-start.md
+  - docs/user-guide/deploying-applications.md
+  - docs/user-guide/managing-deployments.md
+  - docs/user-guide/replication-controller/operations.md
+  - docs/user-guide/resizing-a-replication-controller.md
+  - docs/user-guide/rolling-updates.md
+  - docs/user-guide/update-demo/index.md
+  - docs/user-guide/secrets/walkthrough.md
+  - docs/user-guide/configmap/index.md
+  - docs/user-guide/horizontal-pod-autoscaling/walkthrough.md
+  - docs/user-guide/config-best-practices.md
+  - docs/user-guide/working-with-resources.md
+  - docs/user-guide/garbage-collection.md
   - title: Using NetworkPolicy
     section:
-    - title: Example Walkthrough
-      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/
+    - docs/getting-started-guides/network-policy/walkthrough.md
+    - docs/getting-started-guides/network-policy/calico.md
+    - docs/getting-started-guides/network-policy/romana.md
 
 - title: Batch Jobs
   section:
-  - title: Jobs
-    path: /docs/user-guide/jobs/
-  - title: Parallel Processing using Expansions
-    path: /docs/user-guide/jobs/expansions/
-  - title: Coarse Parallel Processing using a Work Queue
-    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/
+  - docs/user-guide/jobs.md
+  - docs/user-guide/jobs/expansions/index.md
+  - docs/user-guide/jobs/work-queue-1/index.md
+  - docs/user-guide/jobs/work-queue-2/index.md
+  - docs/user-guide/cron-jobs.md
 
 - title: Service Discovery and Load Balancing
   section:
-  - title: Connecting Applications with Services
-    path: /docs/user-guide/connecting-applications/
-  - title: Service Operations
-    path: /docs/user-guide/services/operations/
-  - title: Creating an External Load Balancer
-    path: /docs/user-guide/load-balancer/
-  - title: Configuring Your Cloud Provider's Firewalls
-    path: /docs/user-guide/services-firewalls/
-  - title: Cross-cluster Service Discovery using Federated Services
-    path: /docs/user-guide/federation/federated-services/
+  - docs/user-guide/connecting-applications.md
+  - docs/user-guide/services/operations.md
+  - docs/user-guide/load-balancer.md
+  - docs/user-guide/services-firewalls.md
+  - docs/user-guide/federation/federated-services.md
 
 - title: Containers and Pods
   section:
-  - title: Running Your First Containers
-    path: /docs/user-guide/simple-nginx/
-  - title: Creating Single-Container Pods
-    path: /docs/user-guide/pods/single-container/
-  - title: Creating Multi-Container Pods
-    path: /docs/user-guide/pods/multi-container/
-  - title: Configuring Containers
-    path: /docs/user-guide/configuring-containers/
-  - title: Working with Containers in Production
-    path: /docs/user-guide/production-pods/
-  - title: Commands and Capabilities
-    path: /docs/user-guide/containers/
-  - title: Using Environment Variables
-    path: /docs/user-guide/environment-guide/
-  - title: Managing Compute Resources
-    path: /docs/user-guide/compute-resources/
-  - title: The Lifecycle of a Pod
-    path: /docs/user-guide/pod-states/
-  - title: Checking Pod Health
-    path: /docs/user-guide/liveness/
-  - title: Container Lifecycle Hooks
-    path: /docs/user-guide/container-environment/
-  - title: Assigning Pods to Nodes
-    path: /docs/user-guide/node-selection/
-  - title: Using the Downward API to Convey Pod Properties
-    path: /docs/user-guide/downward-api/
-  - title: Downward API Volumes
-    path: /docs/user-guide/downward-api/volume
-  - title: Persistent Volumes Walkthrough
-    path: /docs/user-guide/persistent-volumes/walkthrough/
-  - title: Bootstrapping Pet Sets
-    path: /docs/user-guide/petset/bootstrapping/
+  - docs/user-guide/simple-nginx.md
+  - docs/user-guide/pods/single-container.md
+  - docs/user-guide/pods/multi-container.md
+  - docs/user-guide/configuring-containers.md
+  - docs/user-guide/production-pods.md
+  - docs/user-guide/containers.md
+  - docs/user-guide/environment-guide/index.md
+  - docs/user-guide/compute-resources.md
+  - docs/user-guide/pod-states.md
+  - docs/user-guide/liveness/index.md
+  - docs/user-guide/container-environment.md
+  - docs/user-guide/node-selection/index.md
+  - docs/user-guide/downward-api/index.md
+  - docs/user-guide/downward-api/volume/index.md
+  - docs/user-guide/persistent-volumes/walkthrough.md
+  - docs/user-guide/petset/bootstrapping/index.md
 
 - title: Monitoring, Logging, and Debugging Containers
   section:
-  - title: Resource Usage Monitoring
-    path: /docs/user-guide/monitoring/
-  - title: Logging
-    path: /docs/getting-started-guides/logging/
-  - title: Logging with Elasticsearch and Kibana
-    path: /docs/getting-started-guides/logging-elasticsearch/
-  - title: Running Commands in a Container with kubectl exec
-    path: /docs/user-guide/getting-into-containers/
-  - title: Connect with Proxies
-    path: /docs/user-guide/connecting-to-applications-proxy/
-  - title: Connect with Port Forwarding
-    path: /docs/user-guide/connecting-to-applications-port-forward/
+  - docs/user-guide/monitoring.md
+  - docs/getting-started-guides/logging.md
+  - docs/getting-started-guides/logging-elasticsearch.md
+  - docs/user-guide/getting-into-containers.md
+  - docs/user-guide/connecting-to-applications-proxy.md
+  - docs/user-guide/connecting-to-applications-port-forward.md
   - title: Using Explorer to Examine the Runtime Environment
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/explorer
 
 - title: Creating a Cluster
   section:
-  - title: Picking the Right Solution
-    path: /docs/getting-started-guides/
+  - docs/getting-started-guides/index.md
   - title: Running Kubernetes on Your Local Machine
     section:
-    - title: Running Kubernetes Locally via Minikube
-      path: /docs/getting-started-guides/minikube/
-    - title: Deprecated Alternatives
-      path: /docs/getting-started-guides/alternatives/
+    - docs/getting-started-guides/minikube.md
+    - docs/getting-started-guides/alternatives.md
   - title: Running Kubernetes on Turn-key Cloud Solutions
     section:
     - title: Running Kubernetes on Google Container Engine
       path: https://cloud.google.com/container-engine/docs/before-you-begin/
-    - title: Running Kubernetes on Google Compute Engine
-      path: /docs/getting-started-guides/gce/
-    - title: Running Kubernetes on AWS EC2
-      path: /docs/getting-started-guides/aws/
-    - title: Running Kubernetes on Azure
-      path: /docs/getting-started-guides/azure/
-    - title: Running Kubernetes on Azure (Weave-based)
-      path: /docs/getting-started-guides/coreos/azure/
-    - title: Running Kubernetes on CenturyLink Cloud
-      path: /docs/getting-started-guides/clc/
+    - docs/getting-started-guides/gce.md
+    - docs/getting-started-guides/aws.md
+    - docs/getting-started-guides/azure.md
+    - docs/getting-started-guides/coreos/azure/index.md
+    - docs/getting-started-guides/clc.md
     - title: Running Kubernetes on IBM SoftLayer
       path: https://github.com/patrocinio/kubernetes-softlayer
   - title: Running Kubernetes on Custom Solutions
     section:
-    - title: Creating a Custom Cluster from Scratch
-      path: /docs/getting-started-guides/scratch/
+    - docs/getting-started-guides/scratch.md
     - title: Custom Cloud Solutions
       section:
-      - title: CoreOS on AWS or GCE
-        path: /docs/getting-started-guides/coreos/
-      - title: Ubuntu on AWS or Joyent
-        path: /docs/getting-started-guides/juju/
-      - title: CoreOS on Rackspace
-        path: /docs/getting-started-guides/rackspace/
+      - docs/getting-started-guides/coreos/index.md
+      - /docs/getting-started-guides/juju/
+      - docs/getting-started-guides/rackspace.md
     - title: On-Premise VMs
       section:
-      - title: CoreOS on Vagrant
-        path: /docs/getting-started-guides/coreos/
-      - title: Cloudstack
-        path: /docs/getting-started-guides/cloudstack/
-      - title: VMware vSphere
-        path: /docs/getting-started-guides/vsphere/
-      - title: VMware Photon Controller
-        path: /docs/getting-started-guides/photon-controller/
-      - title: Juju
-        path: /docs/getting-started-guides/juju/
-      - title: DCOS
-        path: /docs/getting-started-guides/dcos/
-      - title: CoreOS on libvirt
-        path: /docs/getting-started-guides/libvirt-coreos/
-      - title: oVirt
-        path: /docs/getting-started-guides/ovirt/
-      - title: OpenStack Heat
-        path: /docs/getting-started-guides/openstack-heat/
+      - docs/getting-started-guides/coreos/index.md
+      - docs/getting-started-guides/cloudstack.md
+      - docs/getting-started-guides/vsphere.md
+      - docs/getting-started-guides/photon-controller.md
+      - /docs/getting-started-guides/juju/
+      - docs/getting-started-guides/dcos.md
+      - docs/getting-started-guides/libvirt-coreos.md
+      - docs/getting-started-guides/ovirt.md
+      - docs/getting-started-guides/openstack-heat.md
       - title: rkt
         section:
-        - title: Running Kubernetes with rkt
-          path: /docs/getting-started-guides/rkt/
-        - title: Known Issues when Using rkt
-          path: /docs/getting-started-guides/rkt/notes/
-      - title: Kubernetes on Mesos
-        path: /docs/getting-started-guides/mesos/
-      - title: Kubernetes on Mesos on Docker
-        path: /docs/getting-started-guides/mesos-docker/
+        - docs/getting-started-guides/rkt/index.md
+        - docs/getting-started-guides/rkt/notes.md
+      - docs/getting-started-guides/mesos/index.md
+      - docs/getting-started-guides/mesos-docker.md
     - title: Bare Metal
       section:
-      - title: Offline
-        path: /docs/getting-started-guides/coreos/bare_metal_offline/
-      - title: Fedora via Ansible
-        path: /docs/getting-started-guides/fedora/fedora_ansible_config/
-      - title: Fedora (Single Node)
-        path: /docs/getting-started-guides/fedora/fedora_manual_config/
-      - title: Fedora (Multi Node)
-        path: /docs/getting-started-guides/fedora/flannel_multi_node_cluster/
-      - title: CentOS
-        path: /docs/getting-started-guides/centos/centos_manual_config/
-      - title: CoreOS
-        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
-    path: /docs/getting-started-guides/docker-multinode/
-  - title: Building Large Clusters
-    path: /docs/admin/cluster-large/
-  - title: Running in Multiple Zones
-    path: /docs/admin/multiple-zones/
-  - title: Building High-Availability Clusters
-    path: /docs/admin/high-availability/
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
+      - docs/getting-started-guides/fedora/fedora_manual_config.md
+      - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+      - docs/getting-started-guides/centos/centos_manual_config.md
+      - docs/getting-started-guides/coreos/index.md
+      - /docs/getting-started-guides/ubuntu/
+      - docs/getting-started-guides/windows/index.md
+    - docs/admin/node-conformance.md
+  - docs/getting-started-guides/docker-multinode.md
+  - docs/admin/cluster-large.md
+  - docs/admin/multiple-zones.md
+  - docs/admin/high-availability/index.md
 
 - title: Administering Clusters
   section:
-  - title: Admin Guide
-    path: /docs/admin/
-  - title: Cluster Management Guide
-    path: /docs/admin/cluster-management/
-  - title: kubeadm reference
-    path: /docs/admin/kubeadm/
-  - title: Installing Addons
-    path: /docs/admin/addons/
-  - title: Sharing a Cluster with Namespaces
-    path: /docs/admin/namespaces/
-  - title: Namespaces Walkthrough
-    path: /docs/admin/namespaces/walkthrough/
-  - title: Setting Pod CPU and Memory Limits
-    path: /docs/admin/limitrange/
-  - title: Understanding Resource Quotas
-    path: /docs/admin/resourcequota/
-  - title: Applying Resource Quotas and Limits
-    path: /docs/admin/resourcequota/walkthrough/
-  - title: Kubernetes Components
-    path: /docs/admin/cluster-components/
-  - title: Configuring Kubernetes Use of etcd
-    path: /docs/admin/etcd/
-  - title: Using Multiple Clusters
-    path: /docs/admin/multi-cluster/
+  - docs/admin/index.md
+  - docs/admin/cluster-management.md
+  - docs/admin/kubeadm.md
+  - docs/admin/addons.md
+  - docs/admin/namespaces/index.md
+  - docs/admin/namespaces/walkthrough.md
+  - docs/admin/limitrange/index.md
+  - docs/admin/resourcequota/index.md
+  - docs/admin/resourcequota/walkthrough.md
+  - docs/admin/cluster-components.md
+  - docs/admin/etcd.md
+  - docs/admin/multi-cluster.md
   - title: Changing Cluster Size
     path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/
-  - title: Configuring Multiple Schedulers
-    path: /docs/admin/multiple-schedulers/
-  - title: Networking in Kubernetes
-    path: /docs/admin/networking/
-  - title: Using DNS Pods and Services
-    path: /docs/admin/dns/
+  - docs/admin/multiple-schedulers.md
+  - docs/admin/networking.md
+  - docs/admin/dns.md
   - title: Setting Up and Configuring DNS
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cluster-dns
-  - title: Master <-> Node Communication
-    path: /docs/admin/master-node-communication/
-  - title: Network Plugins
-    path: /docs/admin/network-plugins/
-  - title: Static Pods
-    path: /docs/admin/static-pods/
-  - title: Configuring kubelet Garbage Collection
-    path: /docs/admin/garbage-collection/
-  - title: Configuring Out Of Resource Handling
-    path: /docs/admin/out-of-resource/
-  - title: Configuring Kubernetes with Salt
-    path: /docs/admin/salt/
-  - title: Monitoring Node Health
-    path: /docs/admin/node-problem/
-  - title: AppArmor
-    path: /docs/admin/apparmor/
+  - docs/admin/master-node-communication.md
+  - docs/admin/network-plugins.md
+  - docs/admin/static-pods.md
+  - docs/admin/garbage-collection.md
+  - docs/admin/out-of-resource.md
+  - docs/admin/salt.md
+  - docs/admin/node-problem.md
+  - docs/admin/apparmor/index.md
 
 - title: Administering Federation
   section:
-  - title: Using `kubefed`
-    path: /docs/admin/federation/kubfed/
-  - title: Using `federation-up` and `deploy.sh`
-    path: /docs/admin/federation/
+  - /docs/admin/federation/kubfed/
+  - docs/admin/federation/index.md
diff --git a/_data/reference.yml b/_data/reference.yml
index ce0504eed8..41d9d49558 100644
--- a/_data/reference.yml
+++ b/_data/reference.yml
@@ -1,247 +1,141 @@
 bigheader: "Reference Documentation"
 abstract: "Design docs, concept definitions, and references for APIs and CLIs."
 toc:
-- title: Reference Documentation
-  path: /docs/reference/
+- docs/reference.md
 
 - title: Kubernetes API
   section:
-  - title: Kubernetes API Overview
-    path: /docs/api/
+  - docs/api.md
   - title: Accessing the API
     section:
-    - title: Overview
-      path: /docs/admin/accessing-the-api/
-    - title: Authenticating
-      path: /docs/admin/authentication/
-    - title: Using Authorization Plugins
-      path: /docs/admin/authorization/
-    - title: Using Admission Controllers
-      path: /docs/admin/admission-controllers/
-    - title: Managing Service Accounts
-      path: /docs/admin/service-accounts-admin/
-  - title: Kubernetes API Operations
-    path: /docs/api-reference/v1/operations/
-  - title: Kubernetes API Definitions
-    path: /docs/api-reference/v1/definitions/
-  - title: Kubernetes API Swagger Spec
-    path: /kubernetes/third_party/swagger-ui/
+    - docs/admin/accessing-the-api.md
+    - docs/admin/authentication.md
+    - docs/admin/authorization.md
+    - docs/admin/admission-controllers.md
+    - docs/admin/service-accounts-admin.md
+  - docs/api-reference/v1/operations.html
+  - docs/api-reference/v1/definitions.html
+  - kubernetes/third_party/swagger-ui/index.md
 
 - title: Autoscaling API
   section:
-  - title: Autoscaling API Operations
-    path: /docs/api-reference/autoscaling/v1/operations/
-  - title: Autoscaling API Definitions
-    path: /docs/api-reference/autoscaling/v1/definitions/
+  - docs/api-reference/autoscaling/v1/operations.html
+  - docs/api-reference/autoscaling/v1/definitions.html
 
 - title: Batch API
   section:
-  - title: Batch API Operations
-    path: /docs/api-reference/batch/v1/operations/
-  - title: Batch API Definitions
-    path: /docs/api-reference/batch/v1/definitions/
+  - docs/api-reference/batch/v1/operations.html
+  - docs/api-reference/batch/v1/definitions.html
 
 - 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/
+  - docs/api-reference/extensions/v1beta1/operations.html
+  - docs/api-reference/extensions/v1beta1/definitions.html
 
 - title: kubectl CLI
   section:
-  - title: kubectl Overview
-    path: /docs/user-guide/kubectl-overview/
-  - title: kubectl for Docker Users
-    path: /docs/user-guide/docker-cli-to-kubectl/
-  - title: kubectl Usage Conventions
-    path: /docs/user-guide/kubectl-conventions/
-  - title: JSONpath Support
-    path: /docs/user-guide/jsonpath/
-  - title: kubectl Cheat Sheet
-    path: /docs/user-guide/kubectl-cheatsheet/
+  - docs/user-guide/kubectl-overview.md
+  - docs/user-guide/docker-cli-to-kubectl.md
+  - docs/user-guide/kubectl-conventions.md
+  - docs/user-guide/jsonpath.md
+  - docs/user-guide/kubectl-cheatsheet.md
   - title: kubectl Commands
     section:
-    - title: kubectl
-      path: /docs/user-guide/kubectl/
-    - title: kubectl annotate
-      path: /docs/user-guide/kubectl/kubectl_annotate/
-    - title: kubectl api-versions
-      path: /docs/user-guide/kubectl/kubectl_api-versions/
-    - title: kubectl apply
-      path: /docs/user-guide/kubectl/kubectl_apply/
-    - title: kubectl attach
-      path: /docs/user-guide/kubectl/kubectl_attach/
-    - title: kubectl autoscale
-      path: /docs/user-guide/kubectl/kubectl_autoscale/
-    - title: kubectl cluster-info
-      path: /docs/user-guide/kubectl/kubectl_cluster-info/
-    - title: kubectl config
-      path: /docs/user-guide/kubectl/kubectl_config/
-    - title: kubectl config current-context
-      path: /docs/user-guide/kubectl/kubectl_config_current-context/
-    - title: kubectl config set-cluster
-      path: /docs/user-guide/kubectl/kubectl_config_set-cluster/
-    - title: kubectl config set-context
-      path: /docs/user-guide/kubectl/kubectl_config_set-context/
-    - title: kubectl config set-credentials
-      path: /docs/user-guide/kubectl/kubectl_config_set-credentials/
-    - title: kubectl config set
-      path: /docs/user-guide/kubectl/kubectl_config_set/
-    - title: kubectl config unset
-      path: /docs/user-guide/kubectl/kubectl_config_unset/
-    - title: kubectl config use-context
-      path: /docs/user-guide/kubectl/kubectl_config_use-context/
-    - title: kubectl config view
-      path: /docs/user-guide/kubectl/kubectl_config_view/
-    - title: kubectl convert
-      path: /docs/user-guide/kubectl/kubectl_convert/
-    - title: kubectl cordon
-      path: /docs/user-guide/kubectl/kubectl_cordon/
-    - title: kubectl create
-      path: /docs/user-guide/kubectl/kubectl_create/
-    - title: kubectl create configmap
-      path: /docs/user-guide/kubectl/kubectl_create_configmap/
-    - title: kubectl create namespace
-      path: /docs/user-guide/kubectl/kubectl_create_namespace/
-    - title: kubectl create secret docker-registry
-      path: /docs/user-guide/kubectl/kubectl_create_secret_docker-registry/
-    - title: kubectl create secret
-      path: /docs/user-guide/kubectl/kubectl_create_secret/
-    - title: kubectl create secret generic
-      path: /docs/user-guide/kubectl/kubectl_create_secret_generic/
-    - title: kubectl create serviceaccount
-      path: /docs/user-guide/kubectl/kubectl_create_serviceaccount/
-    - title: kubectl delete
-      path: /docs/user-guide/kubectl/kubectl_delete/
-    - title: kubectl describe
-      path: /docs/user-guide/kubectl/kubectl_describe/
-    - title: kubectl drain
-      path: /docs/user-guide/kubectl/kubectl_drain/
-    - title: kubectl edit
-      path: /docs/user-guide/kubectl/kubectl_edit/
-    - title: kubectl exec
-      path: /docs/user-guide/kubectl/kubectl_exec/
-    - title: kubectl explain
-      path: /docs/user-guide/kubectl/kubectl_explain/
-    - title: kubectl expose
-      path: /docs/user-guide/kubectl/kubectl_expose/
-    - title: kubectl get
-      path: /docs/user-guide/kubectl/kubectl_get/
-    - title: kubectl label
-      path: /docs/user-guide/kubectl/kubectl_label/
-    - title: kubectl logs
-      path: /docs/user-guide/kubectl/kubectl_logs/
-    - title: kubectl patch
-      path: /docs/user-guide/kubectl/kubectl_patch/
-    - title: kubectl port-forward
-      path: /docs/user-guide/kubectl/kubectl_port-forward/
-    - title: kubectl proxy
-      path: /docs/user-guide/kubectl/kubectl_proxy/
-    - title: kubectl replace
-      path: /docs/user-guide/kubectl/kubectl_replace/
-    - title: kubectl rolling-update
-      path: /docs/user-guide/kubectl/kubectl_rolling-update/
-    - title: kubectl rollout
-      path: /docs/user-guide/kubectl/kubectl_rollout/
-    - title: kubectl rollout history
-      path: /docs/user-guide/kubectl/kubectl_rollout_history/
-    - title: kubectl rollout pause
-      path: /docs/user-guide/kubectl/kubectl_rollout_pause/
-    - title: kubectl rollout resume
-      path: /docs/user-guide/kubectl/kubectl_rollout_resume/
-    - title: kubectl rollout undo
-      path: /docs/user-guide/kubectl/kubectl_rollout_undo/
-    - title: kubectl run
-      path: /docs/user-guide/kubectl/kubectl_run/
-    - title: kubectl scale
-      path: /docs/user-guide/kubectl/kubectl_scale/
-    - title: kubectl uncordon
-      path: /docs/user-guide/kubectl/kubectl_uncordon/
-    - title: kubectl version
-      path: /docs/user-guide/kubectl/kubectl_version/
+    - docs/user-guide/kubectl/index.md
+    - docs/user-guide/kubectl/kubectl_annotate.md
+    - docs/user-guide/kubectl/kubectl_api-versions.md
+    - docs/user-guide/kubectl/kubectl_apply.md
+    - docs/user-guide/kubectl/kubectl_attach.md
+    - docs/user-guide/kubectl/kubectl_autoscale.md
+    - docs/user-guide/kubectl/kubectl_cluster-info.md
+    - docs/user-guide/kubectl/kubectl_config.md
+    - docs/user-guide/kubectl/kubectl_config_current-context.md
+    - docs/user-guide/kubectl/kubectl_config_set-cluster.md
+    - docs/user-guide/kubectl/kubectl_config_set-context.md
+    - docs/user-guide/kubectl/kubectl_config_set-credentials.md
+    - docs/user-guide/kubectl/kubectl_config_set.md
+    - docs/user-guide/kubectl/kubectl_config_unset.md
+    - docs/user-guide/kubectl/kubectl_config_use-context.md
+    - docs/user-guide/kubectl/kubectl_config_view.md
+    - docs/user-guide/kubectl/kubectl_convert.md
+    - docs/user-guide/kubectl/kubectl_cordon.md
+    - docs/user-guide/kubectl/kubectl_create.md
+    - docs/user-guide/kubectl/kubectl_create_configmap.md
+    - docs/user-guide/kubectl/kubectl_create_namespace.md
+    - docs/user-guide/kubectl/kubectl_create_secret_docker-registry.md
+    - docs/user-guide/kubectl/kubectl_create_secret.md
+    - docs/user-guide/kubectl/kubectl_create_secret_generic.md
+    - docs/user-guide/kubectl/kubectl_create_serviceaccount.md
+    - docs/user-guide/kubectl/kubectl_delete.md
+    - docs/user-guide/kubectl/kubectl_describe.md
+    - docs/user-guide/kubectl/kubectl_drain.md
+    - docs/user-guide/kubectl/kubectl_edit.md
+    - docs/user-guide/kubectl/kubectl_exec.md
+    - docs/user-guide/kubectl/kubectl_explain.md
+    - docs/user-guide/kubectl/kubectl_expose.md
+    - docs/user-guide/kubectl/kubectl_get.md
+    - docs/user-guide/kubectl/kubectl_label.md
+    - docs/user-guide/kubectl/kubectl_logs.md
+    - docs/user-guide/kubectl/kubectl_patch.md
+    - docs/user-guide/kubectl/kubectl_port-forward.md
+    - docs/user-guide/kubectl/kubectl_proxy.md
+    - docs/user-guide/kubectl/kubectl_replace.md
+    - docs/user-guide/kubectl/kubectl_rolling-update.md
+    - docs/user-guide/kubectl/kubectl_rollout.md
+    - docs/user-guide/kubectl/kubectl_rollout_history.md
+    - docs/user-guide/kubectl/kubectl_rollout_pause.md
+    - docs/user-guide/kubectl/kubectl_rollout_resume.md
+    - docs/user-guide/kubectl/kubectl_rollout_undo.md
+    - docs/user-guide/kubectl/kubectl_run.md
+    - docs/user-guide/kubectl/kubectl_scale.md
+    - docs/user-guide/kubectl/kubectl_uncordon.md
+    - docs/user-guide/kubectl/kubectl_version.md
     - title: Superseded and Deprecated Commands
       section:
-      - title: kubectl namespace
-        path: /docs/user-guide/kubectl/kubectl_namespace/
-      - title: kubectl stop
-        path: /docs/user-guide/kubectl/kubectl_stop/
+      - /docs/user-guide/kubectl/kubectl_namespace/
+      - docs/user-guide/kubectl/kubectl_stop.md
 
 - title: Kubernetes Components
   section:
-  - title: kube-apiserver
-    path: /docs/admin/kube-apiserver/
-  - title: kube-controller-manager
-    path: /docs/admin/kube-controller-manager/
-  - title: kube-proxy
-    path: /docs/admin/kube-proxy/
-  - title: kube-scheduler
-    path: /docs/admin/kube-scheduler/
+  - docs/admin/kube-apiserver.md
+  - docs/admin/kube-controller-manager.md
+  - docs/admin/kube-proxy.md
+  - docs/admin/kube-scheduler.md
   - title: 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/ 
+    - docs/admin/kubelet.md
+    - docs/admin/master-node-communication.md
+    - docs/admin/kubelet-tls-bootstrapping.md
+    - docs/admin/kubelet-authentication-authorization.md
 
 - title: Glossary
   section:
-  - title: Annotations
-    path: /docs/user-guide/annotations/
-  - title: Daemon Sets
-    path: /docs/admin/daemons/
-  - title: Deployments
-    path: /docs/user-guide/deployments/
-  - title: 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/
-  - title: 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: Nodes
-    path: /docs/admin/node/
-  - title: Persistent Volumes
-    path: /docs/user-guide/persistent-volumes/
-  - title: Pet Sets
-    path: /docs/user-guide/petset/
-  - title: Pods
-    path: /docs/user-guide/pods/
-  - title: Pod Security Policies
-    path: /docs/user-guide/pod-security-policy/
-  - title: Replica Sets
-    path: /docs/user-guide/replicasets/
-  - title: Replication Controller
-    path: /docs/user-guide/replication-controller/
-  - title: Resource Quotas
-    path: /docs/admin/resourcequota/
-  - title: Cron Jobs
-    path: /docs/user-guide/cron-jobs/
-  - title: Secrets
-    path: /docs/user-guide/secrets/
-  - title: Security Context
-    path: /docs/user-guide/security-context/
-  - title: Services
-    path: /docs/user-guide/services/
-  - title: Service Accounts
-    path: /docs/user-guide/service-accounts/
-  - title: Third Party Resources
-    path: /docs/user-guide/thirdpartyresources/
-  - title: Volumes
-    path: /docs/user-guide/volumes/
+  - docs/user-guide/annotations.md
+  - docs/admin/daemons.md
+  - docs/user-guide/deployments.md
+  - docs/user-guide/horizontal-pod-autoscaling/index.md
+  - docs/user-guide/images.md
+  - docs/user-guide/ingress.md
+  - docs/user-guide/jobs.md
+  - docs/user-guide/labels.md
+  - docs/user-guide/identifiers.md
+  - docs/user-guide/namespaces.md
+  - docs/user-guide/networkpolicies.md
+  - docs/admin/node.md
+  - docs/user-guide/persistent-volumes/index.md
+  - docs/user-guide/petset.md
+  - docs/user-guide/pods/index.md
+  - docs/user-guide/pod-security-policy/index.md
+  - docs/user-guide/replicasets.md
+  - docs/user-guide/replication-controller/index.md
+  - docs/admin/resourcequota/index.md
+  - docs/user-guide/cron-jobs.md
+  - docs/user-guide/secrets/index.md
+  - docs/user-guide/security-context.md
+  - docs/user-guide/services/index.md
+  - docs/user-guide/service-accounts.md
+  - docs/user-guide/thirdpartyresources.md
+  - docs/user-guide/volumes.md
 
 - title: Kubernetes Design Docs
   section:
@@ -251,8 +145,7 @@ toc:
     path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/
   - 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/
+  - docs/admin/ovs-networking.md
   - title: Security Contexts
     path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
   - title: Security in Kubernetes
@@ -260,29 +153,18 @@ toc:
 
 - title: Federation
   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
-    path: /docs/user-guide/federation/federated-ingress/
-  - title: Federated Namespaces
-    path: /docs/user-guide/federation/namespaces/
-  - title: Federated ReplicaSets
-    path: /docs/user-guide/federation/replicasets/
-  - title: Federated Secrets
-    path: /docs/user-guide/federation/secrets/
-  - title: Federation API
-    path: /docs/federation/api-reference/README/
+  - docs/user-guide/federation/index.md
+  - docs/user-guide/federation/configmap.md
+  - docs/user-guide/federation/daemonsets.md
+  - docs/user-guide/federation/deployment.md
+  - docs/user-guide/federation/events.md
+  - docs/user-guide/federation/federated-ingress.md
+  - docs/user-guide/federation/namespaces.md
+  - docs/user-guide/federation/replicasets.md
+  - docs/user-guide/federation/secrets.md
+  - docs/federation/api-reference/README.md
   - title: Federation Components
     section:
-    - title: federation-apiserver
-      path: /docs/admin/federation-apiserver
+    - docs/admin/federation-apiserver.md
     - title : federation-controller-mananger
       path: /docs/admin/federation-controller-manager
diff --git a/_data/samples.yml b/_data/samples.yml
index 3a9f0bcf28..e94f2b3223 100644
--- a/_data/samples.yml
+++ b/_data/samples.yml
@@ -1,8 +1,7 @@
 bigheader: "Samples"
 abstract: "A collection of example applications that show how to use Kubernetes."
 toc:
-- title: Samples
-  path: /docs/samples/
+- docs/samples.md
 
 - title: Storage / Database / KV
   section:
@@ -67,8 +66,7 @@ toc:
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook-go/
   - title: GuestBook - PHP Server
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook/
-  - title: MEAN stack on Google Cloud Platform
-    path: /docs/getting-started-guides/meanstack/
+  - docs/getting-started-guides/meanstack.md
   - title: MySQL + Wordpress
     path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-wordpress-pd/
   - title: MySQL + Phabricator Server
diff --git a/_data/support.yml b/_data/support.yml
index 487ff3d614..efb049ccb1 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -1,38 +1,25 @@
 bigheader: "Support"
 abstract: "Troubleshooting resources, frequently asked questions, and community support channels."
 toc:
-- title: Support
-  path: /docs/troubleshooting/
+- docs/troubleshooting.md
 
 - title: Contributing to the Kubernetes Docs
   section:
-  - title: Contributing to the Kubernetes Documentation
-    path: /editdocs/
-  - title: Creating a Documentation Pull Request
-    path: /docs/contribute/create-pull-request/
-  - title: Writing a New Topic
-    path: /docs/contribute/write-new-topic/
-  - title: Staging Your Documentation Changes
-    path: /docs/contribute/stage-documentation-changes/
-  - title: Using Page Templates
-    path: /docs/contribute/page-templates/
-  - title: Documentation Style Guide
-    path: /docs/contribute/style-guide/
+  - editdocs.md
+  - docs/contribute/create-pull-request.md
+  - docs/contribute/write-new-topic.md
+  - docs/contribute/stage-documentation-changes.md
+  - docs/contribute/page-templates.md
+  - docs/contribute/style-guide.md
 
 - title: Troubleshooting
   section:
-  - title: Debugging Pods and Replication Controllers
-    path: /docs/user-guide/debugging-pods-and-replication-controllers/
-  - title: Application Introspection and Debugging
-    path: /docs/user-guide/introspection-and-debugging/
-  - title: Retrieving Logs
-    path: /docs/user-guide/logging/
-  - title: Troubleshooting Applications
-    path: /docs/user-guide/application-troubleshooting/
-  - title: Troubleshooting Clusters
-    path: /docs/admin/cluster-troubleshooting/
-  - title: Debugging Services
-    path: /docs/user-guide/debugging-services/
+  - docs/user-guide/debugging-pods-and-replication-controllers.md
+  - docs/user-guide/introspection-and-debugging.md
+  - docs/user-guide/logging.md
+  - docs/user-guide/application-troubleshooting.md
+  - docs/admin/cluster-troubleshooting.md
+  - docs/user-guide/debugging-services.md
 
 - title: Frequently Asked Questions
   section:
@@ -47,8 +34,7 @@ toc:
   section:
   - title: Kubernetes Issue Tracker on GitHub
     path: https://github.com/kubernetes/kubernetes/issues/
-  - title: Report a Security Vulnerability
-    path: /docs/reporting-security-issues/
+  - docs/reporting-security-issues.md
   - title: Release Notes
     path: https://github.com/kubernetes/kubernetes/releases/
   - title: Release Roadmap
diff --git a/_data/tasks.yml b/_data/tasks.yml
index 277efa4886..05a880637a 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -1,63 +1,44 @@
 bigheader: "Tasks"
 abstract: "Step-by-step instructions for performing operations with Kuberentes."
 toc:
-- title: Tasks
-  path: /docs/tasks/
+- docs/tasks/index.md
 
 - title: Configuring Pods and Containers
   section:
-  - title: Defining Environment Variables for a Container
-    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: Configuring a Pod to Use a Volume for Storage
-    path: /docs/tasks/configure-pod-container/configure-volume-storage/
-  - title: Distributing Credentials Securely
-    path: /docs/tasks/configure-pod-container/distribute-credentials-secure/
+  - docs/tasks/configure-pod-container/define-environment-variable-container.md
+  - docs/tasks/configure-pod-container/define-command-argument-container.md
+  - docs/tasks/configure-pod-container/assign-cpu-ram-container.md
+  - docs/tasks/configure-pod-container/configure-volume-storage.md
+  - docs/tasks/configure-pod-container/distribute-credentials-secure.md
 
 - 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/
+  - docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
 
 - title: Debugging Applications in a Cluster
   section:
-  - title: Determining the Reason for Pod Failure
-    path: /docs/tasks/debug-application-cluster/determine-reason-pod-failure/
+  - docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
 
 - title: Accessing the Kubernetes API
   section:
-  - title: Using an HTTP Proxy to Access the Kubernetes API
-    path: /docs/tasks/access-kubernetes-api/http-proxy-access-api/
+  - docs/tasks/access-kubernetes-api/http-proxy-access-api.md
 
 - title: Administering a Cluster
   section:
-  - title: Assigning Pods to Nodes
-    path: /docs/tasks/administer-cluster/assign-pods-nodes/
+  - docs/tasks/administer-cluster/assign-pods-nodes.md
 
-  - 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/
+  - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
+  - docs/tasks/administer-cluster/safely-drain-node.md
 
 - 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/
+  - docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set.md
+  - docs/tasks/manage-stateful-set/scale-stateful-set.md
+  - docs/tasks/manage-stateful-set/deleting-a-statefulset.md
+  - docs/tasks/manage-stateful-set/debugging-a-statefulset.md
+  - docs/tasks/manage-stateful-set/delete-pods.md
 
 - title: Troubleshooting
   section:
-  - title: Debugging Init Containers
-    path: /docs/tasks/troubleshoot/debug-init-containers/
-  - title: Configuring Access Control and Identity Management
-    path: /docs/tasks/administer-cluster/access-control-identity-management/
+  - docs/tasks/troubleshoot/debug-init-containers.md
+  - /docs/tasks/administer-cluster/access-control-identity-management/
diff --git a/_data/tools.yml b/_data/tools.yml
index cf2afca34c..6b743c2e95 100644
--- a/_data/tools.yml
+++ b/_data/tools.yml
@@ -1,5 +1,4 @@
 bigheader: "Tools"
 abstract: "Tools to help you use and enhance Kubernetes."
 toc:
-- title: Tools
-  path: /docs/tools/
+- docs/tools/index.md
diff --git a/_data/tutorials.yml b/_data/tutorials.yml
index 82396ca65a..a4ff243bfb 100644
--- a/_data/tutorials.yml
+++ b/_data/tutorials.yml
@@ -1,63 +1,42 @@
 bigheader: "Tutorials"
 abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
 toc:
-- title: Tutorials
-  path: /docs/tutorials/
+- docs/tutorials/index.md
 - title: Kubernetes Basics
   section:
-  - title: Overview
-    path: /docs/tutorials/kubernetes-basics/
+  - docs/tutorials/kubernetes-basics/index.html
   - title: 1. Create a Cluster
     section:
-    - title: Using Minikube to Create a Cluster
-      path: /docs/tutorials/kubernetes-basics/cluster-intro/
-    - title: Interactive Tutorial - Creating a Cluster
-      path: /docs/tutorials/kubernetes-basics/cluster-interactive/
+    - docs/tutorials/kubernetes-basics/cluster-intro.html
+    - docs/tutorials/kubernetes-basics/cluster-interactive.html
   - title: 2. Deploy an App
     section:
-    - title: Using kubectl to Create a Deployment
-      path: /docs/tutorials/kubernetes-basics/deploy-intro/
-    - title: Interactive Tutorial - Deploying an App
-      path: /docs/tutorials/kubernetes-basics/deploy-interactive/
+    - docs/tutorials/kubernetes-basics/deploy-intro.html
+    - docs/tutorials/kubernetes-basics/deploy-interactive.html
   - title: 3. Explore Your App
     section:
-    - title: Viewing Pods and Nodes
-      path: /docs/tutorials/kubernetes-basics/explore-intro/
-    - title: Interactive Tutorial - Exploring Your App
-      path: /docs/tutorials/kubernetes-basics/explore-interactive/
+    - docs/tutorials/kubernetes-basics/explore-intro.html
+    - docs/tutorials/kubernetes-basics/explore-interactive.html
   - title: 4. Expose Your App Publicly
     section:
-    - title: Using a Service to Expose Your App
-      path: /docs/tutorials/kubernetes-basics/expose-intro/
-    - title: Interactive Tutorial - Exposing Your App
-      path: /docs/tutorials/kubernetes-basics/expose-interactive/
+    - docs/tutorials/kubernetes-basics/expose-intro.html
+    - docs/tutorials/kubernetes-basics/expose-interactive.html
   - title: 5. Scale Your App
     section:
-    - title: Running Multiple Instances of Your App
-      path: /docs/tutorials/kubernetes-basics/scale-intro/
-    - title: Interactive Tutorial - Scaling Your App
-      path: /docs/tutorials/kubernetes-basics/scale-interactive/
+    - docs/tutorials/kubernetes-basics/scale-intro.html
+    - docs/tutorials/kubernetes-basics/scale-interactive.html
   - title: 6. Update Your App
     section:
-    - title: Performing a Rolling Update
-      path: /docs/tutorials/kubernetes-basics/update-intro/
-    - title: Interactive Tutorial - Updating Your App
-      path: /docs/tutorials/kubernetes-basics/update-interactive/
+    - docs/tutorials/kubernetes-basics/update-intro.html
+    - docs/tutorials/kubernetes-basics/update-interactive.html
 - title: Stateless Applications
   section:
-  - title: Running a Stateless Application Using a Deployment
-    path: /docs/tutorials/stateless-application/run-stateless-application-deployment/
-  - title: Using a Service to Access an Application in a Cluster
-    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/
+  - 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
 - 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/
-  - title: Running ZooKeeper, A CP Distributed System
-    path: /docs/tutorials/stateful-application/zookeeper/
+  - docs/tutorials/stateful-application/basic-stateful-set.md
+  - docs/tutorials/stateful-application/run-stateful-application.md
+  - docs/tutorials/stateful-application/run-replicated-stateful-application.md
+  - docs/tutorials/stateful-application/zookeeper.md
diff --git a/_includes/head-header.html b/_includes/head-header.html
index e2b18fa6ee..4a05708d6b 100644
--- a/_includes/head-header.html
+++ b/_includes/head-header.html
@@ -1,4 +1,3 @@
-{% if page.title %}{% assign title=page.title %}{% endif %}
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/_includes/tocsearch.html b/_includes/tocsearch.html
index 38587a21a4..5bd5c5fd50 100644
--- a/_includes/tocsearch.html
+++ b/_includes/tocsearch.html
@@ -1 +1,15 @@
-{% for item in tree %}{% if item.section %}{% assign tree = item.section %}{% include tocsearch.html %}{% else %}{% if item.path == page.url %}{% assign foundTOC = thistoc %}{% assign title = item.title %}{% break %}{% endif %}{% endif %}{% endfor %}
\ No newline at end of file
+{% capture whitespace %}
+  {% for item in include.tree %}
+    {% if found_toc %}
+      {% break %}
+    {% endif %}
+    {% if item.section %}
+      {% include tocsearch.html tree=item.section toc=include.toc %}
+    {% else %}
+      {% if item == page.path %}
+        {% assign found_toc = include.toc %}
+        {% break %}
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endcapture %}
diff --git a/_includes/tree.html b/_includes/tree.html
index 4914c13eef..6387c171e7 100644
--- a/_includes/tree.html
+++ b/_includes/tree.html
@@ -1,6 +1,26 @@
-{% for item in tree %}{% if item.section %}
-<div class="item" data-title="{{ item.title }}">
-  <div class="container">{% assign tree = item.section %}{% include tree.html %}
-  </div>
-</div>{% else %}{% assign prefix = item.path | slice: 0, 4 %}{% if prefix == "http" %}{% assign target=" target='_blank'" %}{% else %}{% assign target="" %}{% endif %}
-    <a class="item" data-title="{{ item.title }}" href="{{ item.path }}"{{ target }}></a>{% endif %}{% endfor %}
\ No newline at end of file
+{% for item in include.tree %}
+  {% if item.section %}
+    <div class="item" data-title="{{ item.title }}">
+      <div class="container">
+        {% include_cached tree.html tree=item.section %}
+      </div>
+    </div>
+  {% else %}
+
+    {% capture whitespace %}
+      {% if item.path %}
+        {% assign path   = item.path %}
+        {% assign title  = item.title %}
+        {% assign target = " target='_blank'" %}
+      {% else %}
+        {% assign page  = site.pages | where: "path", item | first %}
+        {% assign title = page.title %}
+        {% assign path  = page.url %}
+      {% endif %}
+    {% endcapture %}
+
+    {% if path %}
+      <a class="item" data-title="{{ title }}" href="{{ path }}"{{ target }}></a>
+    {% endif %}
+  {% endif %}
+{% endfor %}
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index b97f92d53a..4ac68e8acd 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -1,25 +1,32 @@
-{% for thistoc in site.data.globals.tocs %}{% if foundTOC %}{% break %}{% else %}{% assign tree = site.data[thistoc].toc %}{% include tocsearch.html %}{% endif %}{% endfor %}
-{% for override in site.data.overrides.overrides %}{% if page.path contains override.path %}{% assign notitle = "true" %}{% endif %}{% endfor %}
+{% for current_toc in site.tocs %}
+  {% if found_toc %}
+    {% break %}
+  {% else %}
+    {% assign toc=site.data[current_toc] %}
+    {% include tocsearch.html tree=toc.toc toc=toc %}
+  {% endif %}
+{% endfor %}
+
 <!Doctype html>
-<html id="docs" class="{{site.data[foundTOC].bigheader}}">
+<html id="docs" class="{{ toc.bigheader }}">
 
 {% include head-header.html %}
 
 <!--  HERO  -->
 <section id="hero" class="light-text">
-  <h1>{{ site.data[foundTOC].bigheader }}</h1>
-  <h5>{{ site.data[foundTOC].abstract }}</h5>
+  <h1>{{ toc.bigheader }}</h1>
+  <h5>{{ toc.abstract }}</h5>
   <div id="vendorStrip" class="light-text">
     <ul>
-      <li><a href="/docs/" {% if site.data[foundTOC].bigheader == "Kubernetes Documentation" %}class="YAH"{% endif %}>DOCS HOME</a></li>
-      <li><a href="/docs/user-guide/" {% if site.data[foundTOC].bigheader == "Guides" %}class="YAH"{% endif %}>GUIDES</a></li>
-      <li><a href="/docs/tutorials/" {% if site.data[foundTOC].bigheader == "Tutorials" %}class="YAH"{% endif %}>TUTORIALS</a></li>
-      <li><a href="/docs/tasks/" {% if site.data[foundTOC].bigheader == "Tasks" %}class="YAH"{% endif %}>TASKS</a></li>
-      <li><a href="/docs/concepts/" {% if site.data[foundTOC].bigheader == "Concepts" %}class="YAH"{% endif %}>CONCEPTS</a></li>
-      <li><a href="/docs/reference/" {% if site.data[foundTOC].bigheader == "Reference Documentation" %}class="YAH"{% endif %}>REFERENCE</a></li>
-      <li><a href="/docs/tools/" {% if site.data[foundTOC].bigheader == "Tools" %}class="YAH"{% endif %}>TOOLS</a></li>
-      <li><a href="/docs/samples/" {% if site.data[foundTOC].bigheader == "Samples" %}class="YAH"{% endif %}>SAMPLES</a></li>
-      <li><a href="/docs/troubleshooting/" {% if site.data[foundTOC].bigheader == "Support" %}class="YAH"{% endif %}>SUPPORT</a></li>
+      <li><a href="/docs/" {% if toc.bigheader == "Kubernetes Documentation" %}class="YAH"{% endif %}>DOCS HOME</a></li>
+      <li><a href="/docs/user-guide/" {% if toc.bigheader == "Guides" %}class="YAH"{% endif %}>GUIDES</a></li>
+      <li><a href="/docs/tutorials/" {% if toc.bigheader == "Tutorials" %}class="YAH"{% endif %}>TUTORIALS</a></li>
+      <li><a href="/docs/tasks/" {% if toc.bigheader == "Tasks" %}class="YAH"{% endif %}>TASKS</a></li>
+      <li><a href="/docs/concepts/" {% if toc.bigheader == "Concepts" %}class="YAH"{% endif %}>CONCEPTS</a></li>
+      <li><a href="/docs/reference/" {% if toc.bigheader == "Reference Documentation" %}class="YAH"{% endif %}>REFERENCE</a></li>
+      <li><a href="/docs/tools/" {% if toc.bigheader == "Tools" %}class="YAH"{% endif %}>TOOLS</a></li>
+      <li><a href="/docs/samples/" {% if toc.bigheader == "Samples" %}class="YAH"{% endif %}>SAMPLES</a></li>
+      <li><a href="/docs/troubleshooting/" {% if toc.bigheader == "Support" %}class="YAH"{% endif %}>SUPPORT</a></li>
     </ul>
     <div id="searchBox">
       <input type="text" id="search" placeholder="Search" onkeydown="if (event.keyCode==13) window.location.replace('/docs/search/?q=' + this.value)">
@@ -30,24 +37,29 @@
 <section id="encyclopedia">
   <div id="docsToc">
         <div class="pi-accordion">
-        {% if site.data[foundTOC].bigheader != "Kubernetes Documentation" %}
-        {% assign tree = site.data[foundTOC].toc %}{% include tree.html %}
+        {% if toc.bigheader != "Kubernetes Documentation" %}
+          {% include_cached tree.html tree=toc.toc %}
         {% endif %}
         </div> <!-- /pi-accordion -->
     <button class="push-menu-close-button" onclick="kub.toggleToc()"></button>
   </div> <!-- /docsToc -->
   <div id="docsContent">
         <p><a href="/editdocs#{{ page.path }}" id="editPageButton">Edit This Page</a></p>
-      {% if notitle != "true" %}<h1>{{ title }}</h1>{% endif %}
-    {{ content }}
+
+        {% unless page.notitle %}
+          <h1>{{ page.title }}</h1>
+        {% endunless %}
+
+        {{ content }}
+
         <p><a href=""><img src="https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/{{ page.path }}?pixel" alt="Analytics" /></a>
         {% if page.url != "/404.html" and page.url != "/docs/search/" %}
 		<script type="text/javascript">
 	        PDRTJS_settings_8345992 = {
 		        "id" : "8345992",
-		        "unique_id" : "{{page.url}}",
-		        "title" : "{{title}}",
-		        "permalink" : "http://kubernetes.github.io{{page.url}}"
+		        "unique_id" : "{{ page.url }}",
+		        "title" : "{{ page.title }}",
+		        "permalink" : "http://kubernetes.github.io{{ page.url }}"
 	        };
 	        (function(d,c,j){if(!document.getElementById(j)){var pd=d.createElement(c),s;pd.id=j;pd.src=('https:'==document.location.protocol)?'https://polldaddy.com/js/rating/rating.js':'http://i0.poll.fm/js/rating/rating.js';s=document.getElementsByTagName(c)[0];s.parentNode.insertBefore(pd,s);}}(document,'script','pd-rating-js'));
 		</script>
@@ -58,7 +70,7 @@
 	</div>
 </section>
 
-{% include footer.html %}
+{% include_cached footer.html %}
 
 <button class="flyout-button" onclick="kub.toggleToc()"></button>
 
@@ -80,21 +92,21 @@
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
   ga('create', 'UA-36037335-10', 'auto');
   ga('send', 'pageview');
-	
+
   // hide docs nav area if no nav is present, or if nav only contains a link to the current page
   (function () {
 	  window.addEventListener('DOMContentLoaded', init)
-	  
+
 	  // play nice with our neighbors
 	  function init() {
 		  window.removeEventListener('DOMContentLoaded', init)
 		  hideNav()
 	  }
-	  
+
 	  function hideNav(toc){
 		  if (!toc) toc = document.querySelector('#docsToc')
 		  var container = toc.querySelector('.container')
-		  
+
 		  // container is built dynamically, so it may not be present on the first runloop
 		  if (container) {
 			  if (container.childElementCount === 0 || toc.querySelectorAll('a.item').length === 1) {
diff --git a/docs/user-guide/index.md b/docs/user-guide/index.md
index 626ae67f70..394aa3d131 100644
--- a/docs/user-guide/index.md
+++ b/docs/user-guide/index.md
@@ -1,13 +1,13 @@
 ---
 assignees:
 - davidopp
-title: Guides
+title: User Guide
 ---
 
 The Kubernetes **Guides** can help you work with various aspects of the Kubernetes system.
 
 * The Kubernetes [User Guide](#user-guide-internal) can help you run programs and services on an existing Kubernetes cluster.
-* The [Cluster Admin Guide](/docs/admin/) can help you set up and administrate your own Kubernetes cluster. 
+* The [Cluster Admin Guide](/docs/admin/) can help you set up and administrate your own Kubernetes cluster.
 * The [Developer Guide](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel) can help you either write code to directly access the Kubernetes API, or to contribute directly to the Kubernetes project.
 
 ## <a name="user-guide-internal"></a>Kubernetes User Guide
diff --git a/docs/user-guide/kubectl/kubectl_get.md b/docs/user-guide/kubectl/kubectl_get.md
index 4fea746b61..d15799e08b 100644
--- a/docs/user-guide/kubectl/kubectl_get.md
+++ b/docs/user-guide/kubectl/kubectl_get.md
@@ -55,25 +55,25 @@ kubectl get [(-o|--output=)json|yaml|wide|custom-columns=...|custom-columns-file
 ```
   # List all pods in ps output format.
   kubectl get pods
-  
+
   # List all pods in ps output format with more information (such as node name).
   kubectl get pods -o wide
-  
+
   # List a single replication controller with specified NAME in ps output format.
   kubectl get replicationcontroller web
-  
+
   # List a single pod in JSON output format.
   kubectl get -o json pod web-pod-13je7
-  
+
   # List a pod identified by type and name specified in "pod.yaml" in JSON output format.
   kubectl get -f pod.yaml -o json
-  
+
   # Return only the phase value of the specified pod.
-  kubectl get -o template pod/web-pod-13je7 --template={{.status.phase}}
-  
+  kubectl get -o template pod/web-pod-13je7 --template={% raw %}{{.status.phase}}{% endraw %}
+
   # List all replication controllers and services together in ps output format.
   kubectl get rc,services
-  
+
   # List one or more resources by their type and names.
   kubectl get rc/web service/frontend pods/web-pod-13je7
 ```

From fd5e585ebf63223bf8c069420599b33f66504355 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 20 Dec 2016 11:29:44 +0100
Subject: [PATCH 6/9] Fix kube-dns component name

---
 docs/admin/dns.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/admin/dns.md b/docs/admin/dns.md
index 6115be7363..522e271693 100644
--- a/docs/admin/dns.md
+++ b/docs/admin/dns.md
@@ -251,7 +251,7 @@ If you see that no pod is running or that the pod has failed/completed, the dns
 Use `kubectl logs` command to see logs for the DNS daemons.
 
 ```
-kubectl logs --namespace=kube-system $(kubectl get pods --namespace=kube-system -l k8s-app=kube-dns -o name) -c kubedns
+kubectl logs --namespace=kube-system $(kubectl get pods --namespace=kube-system -l k8s-app=kube-dns -o name) -c kube-dns
 kubectl logs --namespace=kube-system $(kubectl get pods --namespace=kube-system -l k8s-app=kube-dns -o name) -c dnsmasq
 kubectl logs --namespace=kube-system $(kubectl get pods --namespace=kube-system -l k8s-app=kube-dns -o name) -c healthz
 ```

From 22f31bd4ee116159b967119eb638f882b61363f6 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 20 Dec 2016 10:05:57 -0500
Subject: [PATCH 7/9] tell netify to disable the plugin whitelist for now

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 64ceef89a0..4197738280 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ build: ## Build site with production settings and put deliverables in _site.
 	jekyll build
 
 build-preview: ## Build site with drafts and future posts enabled.
-	jekyll build --drafts --future
+	DISABLE_WHITELIST=1 jekyll build --drafts --future
 
 serve: ## Boot the development server.
 	jekyll serve

From ae7983fe6206239b394511ace069fff9eddfce9c Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 20 Dec 2016 14:19:08 -0500
Subject: [PATCH 8/9] bump to pages gem v112

---
 Gemfile.lock | 50 +++++++++++++++++++++++++++++++++++++++++++-------
 Makefile     |  2 +-
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cd6d47a90f..c9255b0075 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
@@ -22,7 +22,7 @@ GEM
     ffi (1.9.14)
     forwardable-extended (2.6.0)
     gemoji (2.1.0)
-    github-pages (109)
+    github-pages (112)
       activesupport (= 4.2.7)
       github-pages-health-check (= 1.3.0)
       jekyll (= 3.3.1)
@@ -42,8 +42,20 @@ GEM
       jekyll-seo-tag (= 2.1.0)
       jekyll-sitemap (= 0.12.0)
       jekyll-swiss (= 0.4.0)
-      jekyll-theme-primer (= 0.1.1)
-      jekyll-titles-from-headings (= 0.1.2)
+      jekyll-theme-architect (= 0.0.3)
+      jekyll-theme-cayman (= 0.0.3)
+      jekyll-theme-dinky (= 0.0.3)
+      jekyll-theme-hacker (= 0.0.3)
+      jekyll-theme-leap-day (= 0.0.3)
+      jekyll-theme-merlot (= 0.0.3)
+      jekyll-theme-midnight (= 0.0.3)
+      jekyll-theme-minimal (= 0.0.3)
+      jekyll-theme-modernist (= 0.0.3)
+      jekyll-theme-primer (= 0.1.5)
+      jekyll-theme-slate (= 0.0.3)
+      jekyll-theme-tactile (= 0.0.3)
+      jekyll-theme-time-machine (= 0.0.3)
+      jekyll-titles-from-headings (= 0.1.3)
       jemoji (= 0.7.0)
       kramdown (= 1.11.1)
       liquid (= 3.0.6)
@@ -108,9 +120,33 @@ GEM
     jekyll-sitemap (0.12.0)
       jekyll (~> 3.3)
     jekyll-swiss (0.4.0)
-    jekyll-theme-primer (0.1.1)
+    jekyll-theme-architect (0.0.3)
       jekyll (~> 3.3)
-    jekyll-titles-from-headings (0.1.2)
+    jekyll-theme-cayman (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-dinky (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-leap-day (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-merlot (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-midnight (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-minimal (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-modernist (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-primer (0.1.5)
+      jekyll (~> 3.3)
+    jekyll-theme-slate (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-tactile (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-time-machine (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.1.3)
       jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
@@ -143,7 +179,7 @@ GEM
       ffi (>= 0.5.0)
     rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.22)
+    sass (3.4.23)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
diff --git a/Makefile b/Makefile
index 4197738280..64ceef89a0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ build: ## Build site with production settings and put deliverables in _site.
 	jekyll build
 
 build-preview: ## Build site with drafts and future posts enabled.
-	DISABLE_WHITELIST=1 jekyll build --drafts --future
+	jekyll build --drafts --future
 
 serve: ## Boot the development server.
 	jekyll serve

From a7c1cc431c7e9e90fa675a503de8d1ee6d88cd06 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 20 Dec 2016 14:21:48 -0500
Subject: [PATCH 9/9] semantically version jekyll-include-cache

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a9bc43ce1..3828560a73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem "github-pages", group: :jekyll_plugins
-gem "jekyll-include-cache"
+gem "jekyll-include-cache", "~> 0.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index c9255b0075..1ae07067d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-include-cache
+  jekyll-include-cache (~> 0.1)
 
 BUNDLED WITH
    1.13.6