diff --git a/docs/admin/daemons.md b/docs/admin/daemons.md
deleted file mode 100644
index fe5f27123f..0000000000
--- a/docs/admin/daemons.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-assignees:
-- erictune
-title: Daemon Sets
----
-
-{% include user-guide-content-moved.md %}
-
-[DaemonSets](/docs/concepts/workloads/controllers/daemonset/)
diff --git a/docs/concepts/workloads/controllers/daemonset.md b/docs/concepts/workloads/controllers/daemonset.md
index 2d5cf0ccac..821acb4994 100644
--- a/docs/concepts/workloads/controllers/daemonset.md
+++ b/docs/concepts/workloads/controllers/daemonset.md
@@ -2,6 +2,9 @@
 assignees:
 - erictune
 title: Daemon Sets
+redirect_from:
+- "/docs/admin/daemons/"
+- "/docs/admin/daemons/.html"
 ---
 
 * TOC
diff --git a/docs/concepts/workloads/controllers/deployment.md b/docs/concepts/workloads/controllers/deployment.md
index 632a8b451b..040afadf62 100644
--- a/docs/concepts/workloads/controllers/deployment.md
+++ b/docs/concepts/workloads/controllers/deployment.md
@@ -3,6 +3,9 @@ assignees:
 - bgrant0607
 - janetkuo
 title: Deployments
+redirect_from:
+- "/docs/user-guide/deployments/"
+- "/docs/user-guide/deployments.html"
 ---
 
 {:toc}
diff --git a/docs/tasks/administer-federation/deployment.md b/docs/tasks/administer-federation/deployment.md
index ff37bafc78..22caa24e66 100644
--- a/docs/tasks/administer-federation/deployment.md
+++ b/docs/tasks/administer-federation/deployment.md
@@ -1,5 +1,8 @@
 ---
 title: Federated Deployment
+redirect_from:
+- "/docs/user-guide/federation/deployment/"
+- "/docs/user-guide/federation/deployment.html"
 ---
 
 {% capture overview %}
@@ -101,4 +104,4 @@ kubectl --context=federation-cluster delete deployment mydep
 
 {% endcapture %}
 
-{% include templates/task.md %}
\ No newline at end of file
+{% include templates/task.md %}
diff --git a/docs/tasks/administer-federation/events.md b/docs/tasks/administer-federation/events.md
index 1d9f72ea0e..de5f6cefd9 100644
--- a/docs/tasks/administer-federation/events.md
+++ b/docs/tasks/administer-federation/events.md
@@ -1,5 +1,8 @@
 ---
 title: Federated Events
+redirect_from:
+- "/docs/user-guide/federation/events/"
+- "/docs/user-guide/federation/events.html"
 ---
 
 This guide explains how to use events in federation control plane to help in debugging.
diff --git a/docs/tasks/administer-federation/ingress.md b/docs/tasks/administer-federation/ingress.md
index 16e82e4953..21d1241ab6 100644
--- a/docs/tasks/administer-federation/ingress.md
+++ b/docs/tasks/administer-federation/ingress.md
@@ -1,5 +1,8 @@
 ---
 title: Federated Ingress
+redirect_from:
+- "/docs/user-guide/federation/federated-ingress/"
+- "/docs/user-guide/federation/federated-ingress.html"
 ---
 
 This guide explains how to use Kubernetes Federated Ingress to deploy
diff --git a/docs/tasks/administer-federation/namespaces.md b/docs/tasks/administer-federation/namespaces.md
index 1ad9ca6259..1fc319f553 100644
--- a/docs/tasks/administer-federation/namespaces.md
+++ b/docs/tasks/administer-federation/namespaces.md
@@ -1,5 +1,8 @@
 ---
 title: Federated Namespaces
+redirect_from:
+- "/docs/user-guide/federation/namespaces/"
+- "/docs/user-guide/federation/namespaces.html"
 ---
 
 {% capture overview %}
@@ -84,4 +87,4 @@ We intend to fix this in the future.
 
 {% endcapture %}
 
-{% include templates/task.md %}
\ No newline at end of file
+{% include templates/task.md %}
diff --git a/docs/tasks/administer-federation/replicaset.md b/docs/tasks/administer-federation/replicaset.md
index 870118efd8..f2b6c5a9d6 100644
--- a/docs/tasks/administer-federation/replicaset.md
+++ b/docs/tasks/administer-federation/replicaset.md
@@ -1,5 +1,8 @@
 ---
 title: Federated ReplicaSets
+redirect_from:
+- "/docs/user-guide/federation/replicasets/"
+- "/docs/user-guide/federation/replicasets.html"
 ---
 
 {% capture overview %}
@@ -98,4 +101,4 @@ We intend to fix this in the future.
 
 {% endcapture %}
 
-{% include templates/task.md %}
\ No newline at end of file
+{% include templates/task.md %}
diff --git a/docs/tasks/administer-federation/secret.md b/docs/tasks/administer-federation/secret.md
index 91fa65b0f8..c4ea460fb5 100644
--- a/docs/tasks/administer-federation/secret.md
+++ b/docs/tasks/administer-federation/secret.md
@@ -1,5 +1,8 @@
 ---
 title: Federated Secrets
+redirect_from:
+- "/docs/user-guide/federation/secrets/"
+- "/docs/user-guide/federation/secrets.html"
 ---
 
 This guide explains how to use secrets in Federation control plane.
diff --git a/docs/user-guide/deployments.md b/docs/user-guide/deployments.md
deleted file mode 100644
index ac7faaab6c..0000000000
--- a/docs/user-guide/deployments.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-assignees:
-- bgrant0607
-- janetkuo
-title: Deployments
----
-
-{% include user-guide-content-moved.md %}
-
-[Deployments](/docs/concepts/workloads/controllers/deployment/)
diff --git a/docs/user-guide/federation/deployment.md b/docs/user-guide/federation/deployment.md
deleted file mode 100644
index df8456d709..0000000000
--- a/docs/user-guide/federation/deployment.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Federated Deployment
----
-
-{% include user-guide-content-moved.md %}
-
-[Federated Deployment](/docs/tasks/administer-federation/deployment/)
diff --git a/docs/user-guide/federation/events.md b/docs/user-guide/federation/events.md
deleted file mode 100644
index f148806bca..0000000000
--- a/docs/user-guide/federation/events.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Federated Events
----
-
-{% include user-guide-content-moved.md %}
-
-[Federated Evemts](/docs/tasks/administer-federation/events/)
diff --git a/docs/user-guide/federation/federated-ingress.md b/docs/user-guide/federation/federated-ingress.md
deleted file mode 100644
index b9a3dc2f51..0000000000
--- a/docs/user-guide/federation/federated-ingress.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Federated Ingress
----
-
-{% include user-guide-content-moved.md %}
-
-[Federated Ingress](/docs/tasks/administer-federation/ingress/)
diff --git a/docs/user-guide/federation/namespaces.md b/docs/user-guide/federation/namespaces.md
deleted file mode 100644
index 76b722c2b8..0000000000
--- a/docs/user-guide/federation/namespaces.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Federated Namespaces
----
-
-{% include user-guide-content-moved.md %}
-
-[Federated Namespaces](/docs/tasks/administer-federation/namespaces/)
diff --git a/docs/user-guide/federation/replicasets.md b/docs/user-guide/federation/replicasets.md
deleted file mode 100644
index 5c597d74ec..0000000000
--- a/docs/user-guide/federation/replicasets.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Federated ReplicaSets
----
-
-{% include user-guide-content-moved.md %}
-
-[Federated ReplicaSets](/docs/tasks/administer-federation/replicaset/)
diff --git a/docs/user-guide/federation/secrets.md b/docs/user-guide/federation/secrets.md
deleted file mode 100644
index bbd503e506..0000000000
--- a/docs/user-guide/federation/secrets.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Federated Secrets
----
-
-{% include user-guide-content-moved.md %}
-
-[Federated Secrets](/docs/tasks/administer-federation/secret/)