Merge branch 'master' into release-1.8

docs/concepts/cluster-administration/federation.md

@@ -97,7 +97,7 @@ The following guides explain some of the resources in detail:
 * [Secrets](/docs/tasks/administer-federation/secret/)
 * [Services](/docs/concepts/cluster-administration/federation-service-discovery/)
 
-[API reference docs](/docs/federation/api-reference/) lists all the
+[API reference docs](/docs/reference/federation/) lists all the
 resources supported by federation apiserver.
 
 ## Cascading deletion

docs/concepts/configuration/secret.md

@@ -651,7 +651,7 @@ Now make the pods:
 }
 ```
 
-Both containers will have the following files present on their filesystems:
+Both containers will have the following files present on their filesystems with the values for each container's environment:
 
 ```shell
 /etc/secret-volume/username

docs/concepts/storage/volumes.md

@@ -27,7 +27,7 @@ Familiarity with [pods](/docs/user-guide/pods) is suggested.
 ## Background
 
 Docker also has a concept of
-[volumes](https://docs.docker.com/userguide/dockervolumes/), though it is
+[volumes](https://docs.docker.com/engine/admin/volumes/), though it is
 somewhat looser and less managed.  In Docker, a volume is simply a directory on
 disk or in another container.  Lifetimes are not managed and until very
 recently there were only local-disk-backed volumes.  Docker now provides volume

docs/concepts/workloads/controllers/daemonset.md

@@ -28,13 +28,13 @@ different flags and/or different memory and cpu requests for different hardware
 
 ### Create a DaemonSet
 
-You can describe a DaemonSet in a YAML file. For example, the deamonset.yaml file below describes a DaemonSet that runs the fluentd-elasticsearch Docker image:
+You can describe a DaemonSet in a YAML file. For example, the daemonset.yaml file below describes a DaemonSet that runs the fluentd-elasticsearch Docker image:
 
-{% include code.html language="yaml" file="deamonset.yaml" ghlink="/docs/concepts/workloads/controllers/deamonset.yaml" %}
+{% include code.html language="yaml" file="daemonset.yaml" ghlink="/docs/concepts/workloads/controllers/daemonset.yaml" %}
 
 * Create a DaemonSet based on the YAML file:
 ```
-kubectl create -f deamonset.yaml
+kubectl create -f daemonset.yaml
 ```
 
 ### Required Fields

docs/concepts/workloads/controllers/petset.md

@@ -259,7 +259,7 @@ You cannot update any field of the PetSet except `spec.replicas` and the `contai
 You can scale a PetSet by updating the "replicas" field. Note however that the controller will only:
 
 1. Create one pet at a time, in order from {0..N-1}, and wait till each one is in [Running and Ready](/docs/user-guide/pod-states) before creating the next
-2. Delete one pet at a time, in reverse order from {N-1..0}, and wait till each one is completely shutdown (past its [terminationGracePeriodSeconds](/docs/user-guide/pods/index#termination-of-pods)) before deleting the next
+2. Delete one pet at a time, in reverse order from {N-1..0}, and wait till each one is completely shutdown (past its [terminationGracePeriodSeconds](/docs/concepts/workloads/pods/pod/#termination-of-pods) before deleting the next
 
 ```shell
 $ kubectl get po
@@ -380,7 +380,7 @@ pod "web-0" deleted
 pod "web-1" deleted
 ```
 
-Deleting the pods will *not* delete the volumes. Until we finalize the recycle policy for these volumes they will have to get cleaned up by an admin. This is to ensure that you have the chance to copy data off the volume before deleting it. Simply deleting the PVC after the pods have left the [terminating state](/docs/user-guide/pods/index#termination-of-pods) should trigger deletion of the backing Persistent Volumes.
+Deleting the pods will *not* delete the volumes. Until we finalize the recycle policy for these volumes they will have to get cleaned up by an admin. This is to ensure that you have the chance to copy data off the volume before deleting it. Simply deleting the PVC after the pods have left the [terminating state](/docs/concepts/workloads/pods/pod/#termination-of-pods) should trigger deletion of the backing Persistent Volumes.
 
 **Note: you will lose all your data once the PVC is deleted, do this with caution.**
 

docs/concepts/workloads/pods/init-containers.md

@@ -88,7 +88,7 @@ Here are some ideas for how to use Init Containers:
   configuration file using Jinja.
 
 More detailed usage examples can be found in the [StatefulSets documentation](/docs/concepts/abstractions/controllers/statefulsets/)
-and the [Production Pods guide](/docs/user-guide/production-pods.md#handling-initialization).
+and the [Production Pods guide](/docs/tasks/#handling-initialization).
 
 ### Init Containers in use