Merge branch 'master' into patch-32

docs/tasks/administer-cluster/overview.md

@@ -70,7 +70,7 @@ project](/docs/admin/salt).
 
 ## Security
 
-* **Kubernetes Container Environment** ([docs/user-guide/container-environment.md](/docs/user-guide/container-environment)):
+* **Kubernetes Container Environment** ([docs/user-guide/container-environment.md](/docs/concepts/containers/container-lifecycle-hooks/)):
   Describes the environment for Kubelet managed containers on a Kubernetes
   node.
 

docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md

@@ -79,8 +79,8 @@ unless the Pod's grace period expires. For more details, see
 
 {% capture whatsnext %}
 
-* Learn more about [Container lifecycle hooks](/docs/user-guide/container-environment/.)
-* Learn more about the [lifecycle of a Pod](https://kubernetes.io/docs/user-guide/pod-states/).
+* Learn more about [Container lifecycle hooks](/docs/concepts/containers/container-lifecycle-hooks/).
+* Learn more about the [lifecycle of a Pod](/docs/user-guide/pod-states/).
 
 
 ### Reference

docs/tasks/configure-pod-container/configure-pod-initialization.md

@@ -84,7 +84,7 @@ The output shows that nginx is serving the web page that was written by the init
 * Learn more about
 [communicating between Containers running in the same Pod](/docs/tasks/configure-pod-container/communicate-containers-same-pod/).
 * Learn more about [init Containers](/docs/user-guide/pods/init-container/).
-* Learn more about [Volumes](/docs/user-guide/volumes/).
+* Learn more about [Volumes](/docs/concepts/storage/volumes/).
 
 {% endcapture %}
 

docs/tasks/configure-pod-container/configure-volume-storage.md

@@ -9,7 +9,7 @@ This page shows how to configure a Pod to use a Volume for storage.
 A Container's file system lives only as long as the Container does, so when a
 Container terminates and restarts, changes to the filesystem are lost. For more
 consistent storage that is independent of the Container, you can use a
-[Volume](/docs/user-guide/volumes). This is especially important for stateful
+[Volume](/docs/concepts/storage/volumes/). This is especially important for stateful
 applications, such as key-value stores and databases. For example, Redis is a
 key-value cache and store.
 
@@ -27,7 +27,7 @@ key-value cache and store.
 
 In this exercise, you create a Pod that runs one Container. This Pod has a
 Volume of type
-[emptyDir](/docs/user-guide/volumes/#emptydir)
+[emptyDir](/docs/concepts/storage/volumes/#emptydir)
 that lasts for the life of the Pod, even if the Container terminates and
 restarts. Here is the configuration file for the Pod:
 
@@ -103,7 +103,7 @@ of `Always`.
 supports many different network-attached storage solutions, including PD on
 GCE and EBS on EC2, which are preferred for critical data, and will handle
 details such as mounting and unmounting the devices on the nodes. See
-[Volumes](/docs/user-guide/volumes) for more details.
+[Volumes](/docs/concepts/storage/volumes/) for more details.
 
 {% endcapture %}
 

docs/tasks/configure-pod-container/distribute-credentials-secure.md

@@ -161,7 +161,7 @@ Here is a configuration file you can use to create a Pod:
 {% capture whatsnext %}
 
 * Learn more about [Secrets](/docs/user-guide/secrets/).
-* Learn about [Volumes](/docs/user-guide/volumes/).
+* Learn about [Volumes](/docs/concepts/storage/volumes/).
 
 ### Reference
 

docs/tasks/configure-pod-container/pull-image-private-registry.md

@@ -122,7 +122,7 @@ Create a Pod that uses your Secret, and verify that the Pod is running:
 
 * Learn more about [Secrets](/docs/user-guide/secrets/).
 * Learn more about
-[using a private registry](/docs/user-guide/images/#using-a-private-registry).
+[using a private registry](/docs/concepts/containers/images/#using-a-private-registry).
 * See [kubectl create secret docker-registry](/docs/user-guide/kubectl/kubectl_create_secret_docker-registry/).
 * See [Secret](/docs/api-reference/v1/definitions/#_v1_secret)
 * See the `imagePullSecrets` field of

docs/tasks/job/fine-parallel-processing-work-queue/index.md

@@ -134,7 +134,7 @@ docker push <username>/job-wq-2
 ```
 
 You need to push to a public repository or [configure your cluster to be able to access
-your private repository](/docs/user-guide/images).
+your private repository](/docs/concepts/containers/images/).
 
 If you are using [Google Container
 Registry](https://cloud.google.com/tools/container-registry/), tag