Merge branch 'master' into release-1.8

docs/concepts/cluster-administration/manage-deployment.md

@@ -82,7 +82,7 @@ Because `kubectl` outputs resource names in the same syntax it accepts, it's eas
 ```shell
 $ kubectl get $(kubectl create -f docs/user-guide/nginx/ -o name | grep service)
 NAME           CLUSTER-IP   EXTERNAL-IP   PORT(S)      AGE
-my-nginx-svc   10.0.0.208                 80/TCP       0s
+my-nginx-svc   10.0.0.208   <pending>     80/TCP       0s
 ```
 
 With the above commands, we first create resources under docs/user-guide/nginx/ and print the resources created with `-o name` output format

docs/concepts/workloads/controllers/deployment.md

@@ -41,7 +41,7 @@ The following is an example of a Deployment. It creates a ReplicaSet to bring up
 
 In this example:
 
-* A Deployment named `nginx` is created, indicated by the `metadata: name` field.
+* A Deployment named `nginx-deployment` is created, indicated by the `metadata: name` field.
 * The Deployment creates three replicated Pods, indicated by the `replicas` field.
 * The Pod template's specification, or `template: spec` field, indicates that
   the Pods run one container, `nginx`, which runs the `nginx`
@@ -137,7 +137,7 @@ The created ReplicaSet ensures that there are three `nginx` Pods running at all
 **Note:** Do not change this label.
 {: .note}
 
-The `pod-template-hash label` is added by the Deployment controller to every ReplicaSet that a Deployment creates or adopts. 
+The `pod-template-hash label` is added by the Deployment controller to every ReplicaSet that a Deployment creates or adopts.
 
 This label ensures that child ReplicaSets of a Deployment do not overlap. It is generated by hashing the `PodTemplate` of the ReplicaSet and using the resulting hash as the label value that is added to the ReplicaSet selector, Pod template labels,
 and in any existing Pods that the ReplicaSet might have.