Merge branch 'master' into mvgen

_data/concepts.yml

@@ -84,8 +84,7 @@ toc:
   section:
   - docs/concepts/storage/volumes.md
   - docs/concepts/storage/persistent-volumes.md
-  - title: Dynamic Provisioning
-    path: http://blog.kubernetes.io/2016/10/dynamic-provisioning-and-storage-in-kubernetes.html
+  - docs/concepts/storage/dynamic-provisioning.md
 
 - title: Cluster Administration
   section:

_data/reference.yml

@@ -70,7 +70,7 @@ toc:
 
 - title: Setup Tools
   section:
-  - docs/admin/kubeadm.md
+  - docs/reference/generated/kubeadm.md
   - title: Kubefed
     section:
     - docs/reference/generated/kubefed.md