diff --git a/docs/admin/authorization/rbac.md b/docs/admin/authorization/rbac.md
index a7d17a9265..85963009cf 100644
--- a/docs/admin/authorization/rbac.md
+++ b/docs/admin/authorization/rbac.md
@@ -506,7 +506,7 @@ This is commonly used by add-on API servers for unified authentication and autho
| system:kube-dns |
kube-dns service account in the kube-system namespace |
-Role for the kube-dns component. |
+Role for the kube-dns component. |
| system:node-bootstrapper |
diff --git a/docs/admin/authorization/webhook.md b/docs/admin/authorization/webhook.md
index 8a807bc35b..a0ba0f8e38 100644
--- a/docs/admin/authorization/webhook.md
+++ b/docs/admin/authorization/webhook.md
@@ -20,7 +20,7 @@ service when determining user privileges.
Mode `Webhook` requires a file for HTTP configuration, specify by the
`--authorization-webhook-config-file=SOME_FILENAME` flag.
-The configuration file uses the [kubeconfig](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/)
+The configuration file uses the [kubeconfig](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/)
file format. Within the file "users" refers to the API Server webhook and
"clusters" refers to the remote service.
diff --git a/docs/concepts/services-networking/service.md b/docs/concepts/services-networking/service.md
index 58e73d9ae9..76f705c996 100644
--- a/docs/concepts/services-networking/service.md
+++ b/docs/concepts/services-networking/service.md
@@ -4,8 +4,8 @@ approvers:
title: Services
---
-Kubernetes [`Pods`](/docs/user-guide/pods) are mortal. They are born and when they die, they
-are not resurrected. [`ReplicationControllers`](/docs/user-guide/replication-controller) in
+Kubernetes [`Pods`](/docs/concepts/workloads/pods/pod/) are mortal. They are born and when they die, they
+are not resurrected. [`ReplicationControllers`](/docs/concepts/workloads/controllers/replicationcontroller/) in
particular create and destroy `Pods` dynamically (e.g. when scaling up or down
or when doing [rolling updates](/docs/user-guide/kubectl/{{page.version}}/#rolling-update)). While each `Pod` gets its own IP address, even
those IP addresses cannot be relied upon to be stable over time. This leads to
@@ -84,7 +84,7 @@ abstract other kinds of backends. For example:
* You want to have an external database cluster in production, but in test
you use your own databases.
* You want to point your service to a service in another
- [`Namespace`](/docs/user-guide/namespaces) or on another cluster.
+ [`Namespace`](/docs/concepts/overview/working-with-objects/namespaces/) or on another cluster.
* You are migrating your workload to Kubernetes and some of your backends run
outside of Kubernetes.
@@ -687,4 +687,4 @@ object](/docs/api-reference/{{page.version}}/#service-v1-core).
## For More Information
-Read [Connecting a Front End to a Back End Using a Service](/docs/tutorials/connecting-apps/connecting-frontend-backend/).
+Read [Connecting a Front End to a Back End Using a Service](/docs/tasks/access-application-cluster/connecting-frontend-backend/).
diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md
index 583e754cf3..b0ee820864 100644
--- a/docs/getting-started-guides/aws.md
+++ b/docs/getting-started-guides/aws.md
@@ -41,11 +41,11 @@ export PATH=/platforms/linux/amd64:$PATH
An up-to-date documentation page for this tool is available here: [kubectl manual](/docs/user-guide/kubectl)
By default, `kubectl` will use the `kubeconfig` file generated during the cluster startup for authenticating against the API.
-For more information, please read [kubeconfig files](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/)
+For more information, please read [kubeconfig files](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/)
### Examples
-See [a simple nginx example](/docs/user-guide/simple-nginx) to try out your new cluster.
+See [a simple nginx example](/docs/tasks/run-application/run-stateless-application-deployment/) to try out your new cluster.
The "Guestbook" application is another popular example to get started with Kubernetes: [guestbook example](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/guestbook/)
diff --git a/docs/tasks/administer-federation/hpa.md b/docs/tasks/administer-federation/hpa.md
index 16cc573196..4a80e2c341 100644
--- a/docs/tasks/administer-federation/hpa.md
+++ b/docs/tasks/administer-federation/hpa.md
@@ -21,7 +21,7 @@ needed most by manipulating the min and max limits of the HPA objects in the fed
* {% include federated-task-tutorial-prereqs.md %}
* You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
general and [HPAs](/docs/tasks/run-application/horizontal-pod-autoscale/) in particular.
The federated HPA is an alpha feature. The API is not enabled by default on the
@@ -136,7 +136,7 @@ the interaction is almost identical to interacting with a normal Kubernetes clus
with a limited set of APIs that are federated). As both Deployments and
HorizontalPodAutoscalers are now federated, `kubectl` commands like `kubectl run`
and `kubectl autoscale` work on federation. Given this fact, the mechanism specified in
-[horizontal pod autoscaler walkthrough](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough)
+[horizontal pod autoscaler walkthrough](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/)
will also work when used with federation.
Care however will need to be taken that when
[generating load on a target deployment](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#step-three-increase-load),
diff --git a/docs/tasks/tools/install-kubectl.md b/docs/tasks/tools/install-kubectl.md
index 5d52e04c74..6b5bb1e7ce 100644
--- a/docs/tasks/tools/install-kubectl.md
+++ b/docs/tasks/tools/install-kubectl.md
@@ -130,7 +130,7 @@ Edit the config file with a text editor of your choice, such as Notepad for exam
## Configure kubectl
-In order for kubectl to find and access a Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when you create a cluster using kube-up.sh or successfully deploy a Minikube cluster. See the [getting started guides](/docs/getting-started-guides/) for more about creating clusters. If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
+In order for kubectl to find and access a Kubernetes cluster, it needs a [kubeconfig file](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/), which is created automatically when you create a cluster using kube-up.sh or successfully deploy a Minikube cluster. See the [getting started guides](/docs/setup/) for more about creating clusters. If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/).
By default, kubectl configuration is located at `~/.kube/config`.
## Check the kubectl configuration
@@ -196,6 +196,6 @@ plugins=(git zsh-completions kubectl)
{% endcapture %}
{% capture whatsnext %}
-[Learn how to launch and expose your application.](/docs/user-guide/quick-start)
+[Learn how to launch and expose your application.](/docs/tasks/access-application-cluster/service-access-application-cluster/)
{% endcapture %}
{% include templates/task.md %}
diff --git a/docs/user-guide/kubectl-cheatsheet.md b/docs/user-guide/kubectl-cheatsheet.md
index 8f3551d29f..5a6ed85593 100644
--- a/docs/user-guide/kubectl-cheatsheet.md
+++ b/docs/user-guide/kubectl-cheatsheet.md
@@ -19,7 +19,7 @@ $ source <(kubectl completion zsh) # setup autocomplete in zsh
## Kubectl Context and Configuration
Set which Kubernetes cluster `kubectl` communicates with and modifies configuration
-information. See [Authenticating Across Clusters with kubeconfig](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/) documentation for
+information. See [Authenticating Across Clusters with kubeconfig](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/) documentation for
detailed config file information.
```console