Merge branch 'master' into release-1.8

docs/tasks/administer-cluster/calico-network-policy.md

@@ -9,7 +9,7 @@ This page shows how to use Calico for NetworkPolicy.
 {% endcapture %}
 
 {% capture prerequisites %}
-* Install Calico for Kubernetes.
+* [Install Calico for Kubernetes](https://docs.projectcalico.org/latest/getting-started/kubernetes/installation/).
 {% endcapture %}
 
 {% capture steps %}

docs/tasks/administer-cluster/configure-multiple-schedulers.md

@@ -138,9 +138,9 @@ scheduler in that pod spec. Let's look at three examples.
 
   Save this file as `pod1.yaml` and submit it to the Kubernetes cluster.
 
-  ```shell
-  kubectl create -f pod1.yaml
-  ```
+```shell
+kubectl create -f pod1.yaml
+```
 
 - Pod spec with `default-scheduler`
 
@@ -151,9 +151,9 @@ scheduler in that pod spec. Let's look at three examples.
 
   Save this file as `pod2.yaml` and submit it to the Kubernetes cluster.
 
-  ```shell
-  kubectl create -f pod2.yaml
-  ```
+```shell
+kubectl create -f pod2.yaml
+```
 
 - Pod spec with `my-scheduler`
 

docs/tasks/administer-cluster/kubeadm-upgrade-1-7.md

@@ -42,7 +42,7 @@ You need to have a Kubernetes cluster running version 1.6.x.
 
 2. Restart kubelet.
 
-       sudo systemctl restart kubelet
+       systemctl restart kubelet
 
 3. Delete the `kube-proxy` DaemonSet.
 
@@ -88,7 +88,7 @@ You need to have a Kubernetes cluster running version 1.6.x.
 
 2. Restart kubelet.
 
-       sudo systemctl restart kubelet
+       systemctl restart kubelet
 
 {% endcapture %}
 

docs/tasks/administer-cluster/namespaces.md

@@ -42,9 +42,10 @@ Or you can get detailed information with:
 
 ```shell
 $ kubectl describe namespaces <name>
-Name:      default
-Labels:    <none>
-Status:    Active
+Name:           default
+Labels:         <none>
+Annotations:    <none>
+Status:         Active
 
 No resource quota.
 

docs/tasks/administer-cluster/opaque-integer-resource-node.md

@@ -134,7 +134,7 @@ opaque-int-resource-special-storage.
 ```yaml
 Capacity:
  ...
- pod.alpha.kubernetes.io/opaque-int-special-storage:  8
+ pod.alpha.kubernetes.io/opaque-int-resource-special-storage:  8
 ```
 
 If you want to allow arbitrary requests for special storage, you
@@ -144,7 +144,7 @@ could advertise special storage in chunks of size 1 byte. In that case, you woul
 ```yaml
 Capacity:
  ...
- pod.alpha.kubernetes.io/opaque-int-special-storage:  8Gi
+ pod.alpha.kubernetes.io/opaque-int-resource-special-storage:  800Gi
 ```
 
 Then a Container could request any number of bytes of special storage, up to 800Gi.

docs/tasks/administer-cluster/static-pod.md

@@ -92,7 +92,7 @@ Notice we cannot delete the pod with the API server (e.g. via [`kubectl`](/docs/
 
 ```shell
 [joe@my-master ~] $ kubectl delete pod static-web-my-node1
-pods/static-web-my-node1
+pod "static-web-my-node1" deleted
 [joe@my-master ~] $ kubectl get pods
 NAME                       READY     STATUS    RESTARTS   AGE
 static-web-my-node1        1/1       Running   0          12s