merge master to 1.10, with fixes (#7682)

_data/concepts.yml

@@ -1,9 +1,11 @@
 bigheader: "Concepts"
 abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
+landing_page: /docs/concepts/index/
 toc:
 - docs/concepts/index.md
 
 - title: Overview
+  landing_page: /docs/concepts/overview/what-is-kubernetes/
   section:
   - docs/concepts/overview/what-is-kubernetes.md
   - docs/concepts/overview/components.md
@@ -23,12 +25,14 @@ toc:
     - docs/concepts/overview/object-management-kubectl/declarative-config.md
 
 - title: Kubernetes Architecture
+  landing_page: /docs/concepts/architecture/nodes/
   section:
   - docs/concepts/architecture/nodes.md
   - docs/concepts/architecture/master-node-communication.md
   - docs/concepts/architecture/cloud-controller.md
 
 - title: Extending Kubernetes
+  landing_page: /docs/concepts/api-extension/custom-resources/
   section:
   - docs/concepts/overview/extending.md
   - title: Extending the Kubernetes API
@@ -43,12 +47,14 @@ toc:
   - docs/concepts/service-catalog/index.md
 
 - title: Containers
+  landing_page: /docs/concepts/containers/images/
   section:
   - docs/concepts/containers/images.md
   - docs/concepts/containers/container-environment-variables.md
   - docs/concepts/containers/container-lifecycle-hooks.md
 
 - title: Workloads
+  landing_page: /docs/concepts/workloads/pods/pod-overview/
   section:
   - title: Pods
     section:
@@ -70,6 +76,7 @@ toc:
     - docs/concepts/workloads/controllers/cron-jobs.md
 
 - title: Configuration
+  landing_page: /docs/concepts/configuration/overview/
   section:
   - docs/concepts/configuration/overview.md
   - docs/concepts/configuration/manage-compute-resources-container.md
@@ -80,6 +87,7 @@ toc:
   - docs/concepts/configuration/pod-priority-preemption.md
 
 - title: Services, Load Balancing, and Networking
+  landing_page: /docs/concepts/services-networking/service/
   section:
   - docs/concepts/services-networking/service.md
   - docs/concepts/services-networking/dns-pod-service.md
@@ -89,6 +97,7 @@ toc:
   - docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
 
 - title: Storage
+  landing_page: /docs/concepts/storage/volumes/
   section:
   - docs/concepts/storage/volumes.md
   - docs/concepts/storage/persistent-volumes.md
@@ -96,6 +105,7 @@ toc:
   - docs/concepts/storage/dynamic-provisioning.md
 
 - title: Cluster Administration
+  landing_page: /docs/concepts/cluster-administration/cluster-administration-overview/
   section:
   - docs/concepts/cluster-administration/cluster-administration-overview.md
   - docs/concepts/cluster-administration/certificates.md
@@ -116,5 +126,3 @@ toc:
     section:
     - docs/concepts/policy/resource-quotas.md
     - docs/concepts/policy/pod-security-policy.md
-
-