Merge branch 'master' into release-1.9

_data/concepts.yml

@@ -24,6 +24,7 @@ toc:
 
 - title: Extending Kubernetes
   section:
+  - docs/concepts/overview/extending.md
   - title: Extending the Kubernetes API
     section:
     - docs/concepts/api-extension/apiserver-aggregation.md

_data/glossary/platform-developer.yaml

@@ -2,9 +2,10 @@ id: platform-developer
 name: Platform Developer
 aka:
   - Kubernetes Developer
+  - Extension Developer
 tags:
   - user-type
 short-description: >
   A person who customizes the Kubernetes platform to fit the needs of their project.
 long-description: >
-  A platform developer may, for example, use [Custom Resources](/docs/concepts/api-extension/custom-resources/) or [Extend the Kubernetes API with the aggregation layer](/docs/concepts/api-extension/apiserver-aggregation/) to add functionality to their instance of Kubernetes, specifically for their application.
+  A platform developer may, for example, use [Custom Resources](/docs/concepts/api-extension/custom-resources/) or [Extend the Kubernetes API with the aggregation layer](/docs/concepts/api-extension/apiserver-aggregation/) to add functionality to their instance of Kubernetes, specifically for their application.  Some Platform Developers are also {% glossary_tooltip text="contributors" term_id="contributor" %} and develop extensions which are contributed to the Kubernetes community.  Others develop closed-source commercial or site-specific extensions.

_data/reference.yml

@@ -49,26 +49,16 @@ toc:
 
 - title: kubectl CLI
   section:
-  - docs/user-guide/kubectl-overview.md
-  - docs/user-guide/kubectl/index.md
-  - title: v1.8 Commands
-    path: /docs/user-guide/kubectl/v1.8/
-  - title: v1.7 Commands
-    path: /docs/user-guide/kubectl/v1.7/
-  - title: v1.6 Commands
-    path: /docs/user-guide/kubectl/v1.6/
-  - title: v1.5 Commands
-    path: /docs/user-guide/kubectl/v1.5/
-  - 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
+  - docs/reference/kubectl/overview.md
+  - docs/reference/generated/kubectl/kubectl-options.md
+  - title: kubectl Commands
+    path: /docs/reference/generated/kubectl/kubectl-commands.html
+  - docs/reference/kubectl/docker-cli-to-kubectl.md
+  - docs/reference/kubectl/conventions.md
+  - docs/reference/kubectl/jsonpath.md
+  - docs/reference/kubectl/cheatsheet.md
 
-- title: Cloud Controller Manager
-  section:
-  - docs/reference/generated/cloud-controller-manager.md
-
-- title: Setup Tools
+- title: Setup Tools Reference
   section:
   - title: Kubeadm
     section:
@@ -90,7 +80,7 @@ toc:
     - docs/reference/generated/kubefed_unjoin.md
     - docs/reference/generated/kubefed_version.md
 
-- title: Config Reference
+- title: Command-line Tools Reference
   section:
   - docs/reference/generated/kubelet.md
   - docs/admin/kubelet-authentication-authorization.md
@@ -99,6 +89,7 @@ toc:
   - docs/reference/generated/kube-proxy.md
   - docs/reference/generated/kube-scheduler.md
   - docs/admin/kubelet-tls-bootstrapping.md
+  - docs/reference/generated/cloud-controller-manager.md
   - docs/reference/generated/federation-apiserver.md
   - docs/reference/generated/federation-controller-manager.md