Merge branch 'master' into release-1.8

docs/tasks/administer-cluster/encrypt-data.md

@@ -14,6 +14,8 @@ This page shows how to enable and configure encryption of secret data at rest.
 
 * Kubernetes version 1.7.0 or later is required
 
+* etcd v3 or later is required
+
 * Encryption at rest is alpha in 1.7.0 which means it may change without notice. Users may be required to decrypt their data prior to upgrading to 1.8.0.
 
 {% endcapture %}

docs/tasks/administer-cluster/highly-available-master.md

@@ -154,5 +154,4 @@ To make such deployment secure, communication between etcd instances is authoriz
 
 ## Additional reading
 
-[Automated HA master deployment - design doc](https://git.k8s.io/community/contributors/design-proposals/ha_master.md)
-
+[Automated HA master deployment - design doc](https://git.k8s.io/community/contributors/design-proposals/cluster-lifecycle/ha_master.md)

docs/tasks/administer-cluster/memory-constraint-namespace.md

@@ -123,7 +123,7 @@ kubectl delete pod constraints-mem-demo --namespace=constraints-mem-example
 ## Attempt to create a Pod that exceeds the maximum memory constraint
 
 Here's the configuration file for a Pod that has one Container. The Container specifies a
-memory request of 700 MiB and a memory limit of 1.5 GiB.
+memory request of 800 MiB and a memory limit of 1.5 GiB.
 
 {% include code.html language="yaml" file="memory-constraints-pod-2.yaml" ghlink="/docs/tasks/administer-cluster/memory-constraints-pod-2.yaml" %}
 

docs/tasks/administer-cluster/namespaces.md

@@ -63,7 +63,7 @@ to define *Hard* resource usage limits that a *Namespace* may consume.
 A limit range defines min/max constraints on the amount of resources a single entity can consume in
 a *Namespace*.
 
-See [Admission control: Limit Range](https://git.k8s.io/community/contributors/design-proposals/admission_control_limit_range.md)
+See [Admission control: Limit Range](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_limit_range.md)
 
 A namespace can be in one of two phases:
 
@@ -236,9 +236,9 @@ Let's create some contents.
 ```shell
 $ kubectl run snowflake --image=kubernetes/serve_hostname --replicas=2
 ```
-We have just created a deployment whose replica size is 2 that is running the pod called snowflake with a basic container that just serves the hostname. 
+We have just created a deployment whose replica size is 2 that is running the pod called snowflake with a basic container that just serves the hostname.
 Note that `kubectl run` creates deployments only on Kubernetes cluster >= v1.2. If you are running older versions, it creates replication controllers instead.
-If you want to obtain the old behavior, use `--generator=run/v1` to create replication controllers. See [`kubectl run`](/docs/user-guide/kubectl/v1.7/#run) for more details. 
+If you want to obtain the old behavior, use `--generator=run/v1` to create replication controllers. See [`kubectl run`](/docs/user-guide/kubectl/v1.7/#run) for more details.
 
 ```shell
 $ kubectl get deployment
@@ -322,7 +322,7 @@ The Namespace provides a unique scope for:
 2. delegated management authority to trusted users
 3. ability to limit community resource consumption
 
-Use cases include: 
+Use cases include:
 
 1.  As a cluster operator, I want to support multiple user communities on a single cluster.
 2.  As a cluster operator, I want to delegate authority to partitions of the cluster to trusted users