Merge branch 'master' of https://github.com/kubernetes/website into r…

…elease-1.10

* 'master' of https://github.com/kubernetes/website:
  Update overview.md (#7836)
  Consolidate all upgrade/downgrade admin tasks (#7735)
  add generated docs for tools and components (#7845) (#7866)
  update generated api-reference docs for 1.10 (#7856) (#7864)
  Merge 1.10 to master for release (#7861)

_data/tasks.yml

@@ -129,6 +129,13 @@ toc:
 - title: Administer a Cluster
   landing_page: /docs/tasks/administer-cluster/memory-default-namespace/
   section:
+  - title: Upgrading or downgrading Kubernetes
+    section:
+    - docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6.md
+    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-7.md
+    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-8.md
+    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-9.md
+    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-ha.md
   - title: Manage Memory, CPU, and API Resources
     section:
     - docs/tasks/administer-cluster/memory-default-namespace.md
@@ -149,11 +156,6 @@ toc:
   - docs/tasks/administer-cluster/configure-upgrade-etcd.md
   - docs/tasks/administer-cluster/static-pod.md
   - docs/tasks/administer-cluster/cluster-management.md
-  - docs/tasks/administer-cluster/upgrade-1-6.md
-  - docs/tasks/administer-cluster/kubeadm-upgrade-1-7.md
-  - docs/tasks/administer-cluster/kubeadm-upgrade-1-8.md
-  - docs/tasks/administer-cluster/kubeadm-upgrade-1-9.md
-  - docs/tasks/administer-cluster/kubeadm-upgrade-ha.md
   - docs/tasks/administer-cluster/namespaces.md
   - docs/tasks/administer-cluster/namespaces-walkthrough.md
   - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md

_redirects

@@ -29,7 +29,7 @@
 /docs/admin/ha-master-gce/     /docs/tasks/administer-cluster/highly-available-master/ 301
 /docs/admin/ha-master-gce.md/     /docs/tasks/administer-cluster/highly-available-master/ 301
 /docs/admin/high-availability/      /docs/admin/high-availability/building/ 301
-/docs/admin/kubeadm-upgrade-1-7/     /docs/tasks/administer-cluster/kubeadm-upgrade-1-7/ 301
+/docs/admin/kubeadm-upgrade-1-7/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-7/ 301
 /docs/admin/limitrange/     /docs/tasks/administer-cluster/cpu-memory-limit/ 301
 /docs/admin/limitrange/Limits/     /docs/tasks/administer-cluster/limit-storage-consumption/#limitrange-to-limit-requests-for-storage/ 301
 /docs/admin/master-node-communication/     /docs/concepts/architecture/master-node-communication/ 301
@@ -51,8 +51,8 @@
 /docs/admin/resourcequota/walkthrough/     /docs/tasks/administer-cluster/quota-api-object/ 301
 /docs/admin/static-pods/     /docs/tasks/administer-cluster/static-pod/ 301
 /docs/admin/sysctls/     /docs/tasks/administer-cluster/sysctl-cluster/ 301
-/docs/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-1-6/ 301
 /docs/admin/resource-quota/     /docs/concepts/policy/resource-quotas/     301
+/docs/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6/ 301
 
 /docs/api/     /docs/concepts/overview/kubernetes-api/ 301
 
@@ -215,11 +215,16 @@
 /docs/tasks/administer-cluster/default-cpu-request-limit/     /docs/tasks/configure-pod-container/assign-cpu-resource/#specify-a-cpu-request-and-a-cpu-limit/ 301
 /docs/tasks/administer-cluster/default-memory-request-limit/     /docs/tasks/configure-pod-container/assign-memory-resource/#specify-a-memory-request-and-a-memory-limit/ 301
 /docs/tasks/administer-cluster/developing-cloud-controller-manager.md     /docs/tasks/administer-cluster/developing-cloud-controller-manager/ 301
+/docs/tasks/administer-cluster/kubeadm-upgrade-1-7/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-7/ 301
+/docs/tasks/administer-cluster/kubeadm-upgrade-1-8/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-8/ 301
+/docs/tasks/administer-cluster/kubeadm-upgrade-1-9/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-9/ 301
+/docs/tasks/administer-cluster/kubeadm-upgrade-ha/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-ha9/ 301
 /docs/tasks/administer-cluster/out-of-resource/memory-available.sh     /docs/tasks/administer-cluster/memory-available.sh 301
 /docs/tasks/administer-cluster/overview/     /docs/concepts/cluster-administration/cluster-administration-overview/ 301
 /docs/tasks/administer-cluster/reserve-compute-resources/out-of-resource.md     /docs/tasks/administer-cluster/out-of-resource/ 301
 /docs/tasks/administer-cluster/running-cloud-controller.md     /docs/tasks/administer-cluster/running-cloud-controller/ 301
 /docs/tasks/administer-cluster/share-configuration/     /docs/tasks/access-application-cluster/configure-access-multiple-clusters/ 301
+/docs/tasks/administer-cluster/upgrade-1-6/      /docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6/ 301
 /docs/tasks/configure-pod-container/apply-resource-quota-limit/     /docs/tasks/administer-cluster/apply-resource-quota-limit/ 301
 /docs/tasks/configure-pod-container/assign-cpu-ram-container/     /docs/tasks/configure-pod-container/assign-memory-resource/ 301
 /docs/tasks/configure-pod-container/calico-network-policy/     /docs/tasks/administer-cluster/calico-network-policy/ 301

docs/reference/index.md

@@ -8,7 +8,8 @@ approvers:
 
 * [Kubernetes API Overview](/docs/reference/api-overview/) - Overview of the API for Kubernetes.
 * Kubernetes API Versions
-  * [1.9](/docs/reference/generated/kubernetes-api/v1.9/)
+  * [1.10](/docs/reference/generated/kubernetes-api/v1.10/)
+  * [1.9](https://v1-9.docs.kubernetes.io/docs/reference/)
   * [1.8](https://v1-8.docs.kubernetes.io/docs/reference/)
   * [1.7](https://v1-7.docs.kubernetes.io/docs/reference/)
   * [1.6](https://v1-6.docs.kubernetes.io/docs/reference/)

docs/reference/kubectl/overview.md

@@ -19,7 +19,7 @@ where `command`, `TYPE`, `NAME`, and `flags` are:
 
 * `command`: Specifies the operation that you want to perform on one or more resources, for example `create`, `get`, `describe`, `delete`.
 
-* `TYPE`: Specifies the [resource type](#resource-types). Resource types are case-sensitive and you can specify the singular, plural, or abbreviated forms. For example, the following commands produce the same output:
+* `TYPE`: Specifies the [resource type](#resource-types). Resource types are case-insensitive and you can specify the singular, plural, or abbreviated forms. For example, the following commands produce the same output:
 
       $ kubectl get pod pod1
       $ kubectl get pods pod1