diff --git a/docs/concepts/configuration/assign-pod-node.md b/docs/concepts/configuration/assign-pod-node.md
index 5ae6621fa6..da96a4d526 100644
--- a/docs/concepts/configuration/assign-pod-node.md
+++ b/docs/concepts/configuration/assign-pod-node.md
@@ -4,6 +4,9 @@ assignees:
 - kevin-wangzefeng
 - bsalamat
 title: Assigning Pods to Nodes
+redirect_from:
+- "/docs/user-guide/node-selection/"
+- "/docs/user-guide/node-selection/index.html"
 ---
 
 You can constrain a [pod](/docs/concepts/workloads/pods/pod/) to only be able to run on particular [nodes](/docs/concepts/nodes/node/) or to prefer to
diff --git a/docs/concepts/containers/container-lifecycle-hooks.md b/docs/concepts/containers/container-lifecycle-hooks.md
index 3d77009be2..206e86fb40 100644
--- a/docs/concepts/containers/container-lifecycle-hooks.md
+++ b/docs/concepts/containers/container-lifecycle-hooks.md
@@ -3,6 +3,9 @@ assignees:
 - mikedanese
 - thockin
 title: Container Lifecycle Hooks
+redirect_from:
+- "/docs/user-guide/container-environment/"
+- "/docs/user-guide/container-environment.html"
 ---
 
 {% capture overview %}
diff --git a/docs/concepts/containers/images.md b/docs/concepts/containers/images.md
index 45725fb6cf..91c42acbd3 100644
--- a/docs/concepts/containers/images.md
+++ b/docs/concepts/containers/images.md
@@ -3,6 +3,9 @@ assignees:
 - erictune
 - thockin
 title: Images
+redirect_from:
+- "/docs/user-guide/images/"
+- "/docs/user-guide/images.html"
 ---
 
 {% capture overview %}
diff --git a/docs/concepts/storage/persistent-volumes.md b/docs/concepts/storage/persistent-volumes.md
index 37bb88cb0e..9a04bef22e 100644
--- a/docs/concepts/storage/persistent-volumes.md
+++ b/docs/concepts/storage/persistent-volumes.md
@@ -5,6 +5,9 @@ assignees:
 - saad-ali
 - thockin
 title: Persistent Volumes
+redirect_from:
+- "/docs/user-guide/persistent-volumes/"
+- "/docs/user-guide/persistent-volumes/index.html"
 ---
 
 This document describes the current state of `PersistentVolumes` in Kubernetes.  Familiarity with [volumes](/docs/concepts/storage/volumes/) is suggested.
diff --git a/docs/concepts/storage/volumes.md b/docs/concepts/storage/volumes.md
index fed7299394..422baa176a 100644
--- a/docs/concepts/storage/volumes.md
+++ b/docs/concepts/storage/volumes.md
@@ -5,6 +5,9 @@ assignees:
 - saad-ali
 - thockin
 title: Volumes
+redirect_from:
+- "/docs/user-guide/volumes/"
+- "/docs/user-guide/volumes.html"
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information.md b/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information.md
index e8666ddd36..2166b633c8 100644
--- a/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information.md
+++ b/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information.md
@@ -1,5 +1,11 @@
 ---
 title: Exposing Pod Information to Containers Using the Downward API
+redirect_from:
+- "/docs/user-guide/downward-api/"
+- "/docs/user-guide/downward-api/index.html"
+redirect_from:
+- "/docs/user-guide/downward-api/volume/"
+- "/docs/user-guide/downward-api/volume/index.html"
 ---
 
 {% capture overview %}
diff --git a/docs/user-guide/container-environment.md b/docs/user-guide/container-environment.md
deleted file mode 100644
index f7e8b07a46..0000000000
--- a/docs/user-guide/container-environment.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Container Lifecycle Hooks
----
-
-{% include user-guide-content-moved.md %}
-
-[Container Lifecycle Hooks](/docs/concepts/containers/container-lifecycle-hooks/)
diff --git a/docs/user-guide/downward-api/index.md b/docs/user-guide/downward-api/index.md
deleted file mode 100644
index beb1cddd9b..0000000000
--- a/docs/user-guide/downward-api/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-assignees:
-- bgrant0607
-- mikedanese
-title: Using the Downward API to Convey Pod Properties
----
-
-{% include user-guide-content-moved.md %}
-
-[Exposing Pod Information to Containers Using a DownwardAPIVolumeFile](/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information/)
diff --git a/docs/user-guide/downward-api/volume/index.md b/docs/user-guide/downward-api/volume/index.md
deleted file mode 100644
index 6f359cc797..0000000000
--- a/docs/user-guide/downward-api/volume/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Downward API Volumes
----
-
-{% include user-guide-content-moved.md %}
-
-[Exposing Pod Information to Containers Using a DownwardAPIVolumeFile](/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information/)
diff --git a/docs/user-guide/images.md b/docs/user-guide/images.md
deleted file mode 100644
index 2605a436b8..0000000000
--- a/docs/user-guide/images.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Images
----
-
-{% include user-guide-content-moved.md %}
-
-[Images](/docs/concepts/containers/images/)
diff --git a/docs/user-guide/node-selection/index.md b/docs/user-guide/node-selection/index.md
deleted file mode 100644
index eb740c9d89..0000000000
--- a/docs/user-guide/node-selection/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-assignees:
-- davidopp
-- kevin-wangzefeng
-- bsalamat
-title: Assigning Pods to Nodes
----
-
-{% include user-guide-content-moved.md %}
-
-[Assigning Pods to Nodes](/docs/concepts/configuration/assign-pod-node/)
diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md
deleted file mode 100644
index 94fc704a85..0000000000
--- a/docs/user-guide/persistent-volumes/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-assignees:
-- jsafrane
-- mikedanese
-- saad-ali
-- thockin
-title: Persistent Volumes
----
-
-{% include user-guide-content-moved.md %}
-
-[Persistent Volumes](/docs/concepts/storage/persistent-volumes/)
diff --git a/docs/user-guide/volumes.md b/docs/user-guide/volumes.md
deleted file mode 100644
index cc8862fd52..0000000000
--- a/docs/user-guide/volumes.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Volumes
----
-
-{% include user-guide-content-moved.md %}
-
-[Volumes](/docs/concepts/storage/volumes/)