Review conflicts from 1.6-release/master merges

docs/concepts/overview/kubernetes-api.md

@@ -106,4 +106,4 @@ to pick up the `--runtime-config` changes.
 DaemonSets, Deployments, HorizontalPodAutoscalers, Ingress, Jobs and ReplicaSets are enabled by default.
 Other extensions resources can be enabled by setting `--runtime-config` on
 apiserver. `--runtime-config` accepts comma separated values. For ex: to disable deployments and jobs, set
-`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false`
+`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/ingress=false`

docs/concepts/overview/what-is-kubernetes.md

@@ -76,7 +76,7 @@ Kubernetes satisfies a number of common needs of applications running in product
 * [load balancing](/docs/concepts/services-networking/service/),
 * [rolling updates](/docs/tasks/run-application/rolling-update-replication-controller/),
 * [resource monitoring](/docs/concepts/cluster-administration/resource-usage-monitoring/),
-* [log access and ingestion](/docs/concepts/clusters/logging/),
+* [log access and ingestion](/docs/concepts/cluster-administration/logging/),
 * [support for introspection and debugging](/docs/tasks/debug-application-cluster/debug-application-introspection/), and
 * [identity and authorization](/docs/admin/authorization/).