Merge branch 'master' into 4549-complete-sentence

docs/tasks/administer-federation/ingress.md

@@ -22,7 +22,7 @@ unresponsive clusters).
 Federated Ingress is released as an alpha feature, and supports Google Cloud Platform (GKE,
 GCE and hybrid scenarios involving both) in Kubernetes v1.4.  Work is under way to support other cloud
 providers such as AWS, and other hybrid cloud scenarios (e.g. services
-spanning private on-premise as well as public cloud Kubernetes
+spanning private on-premises as well as public cloud Kubernetes
 clusters).
 
 You create Federated Ingresses in much that same way as traditional
@@ -303,7 +303,3 @@ Check that:
  [Federation proposal](https://git.k8s.io/community/contributors/design-proposals/federation.md).
 {% endcapture %}
 {% include templates/task.md %}
-
-
-
-

docs/tasks/federation/policy.rego

@@ -35,13 +35,13 @@ annotations["federation.kubernetes.io/replica-set-preferences"] = preferences {
 #
 # In English, the policy asserts that resources in the "production" namespace
 # that are not annotated with "criticality=low" MUST be placed on clusters
-# labelled with "on-premise=true".
+# labelled with "on-premises=true".
 annotations["federation.alpha.kubernetes.io/cluster-selector"] = selector {
     input.metadata.namespace = "production"
     not input.metadata.annotations.criticality = "low"
     json.marshal([{
         "operator": "=",
-        "key": "on-premise",
+        "key": "on-premises",
         "values": "[true]",
     }], selector)
 }

docs/tasks/manage-gpus/scheduling-gpus.md

@@ -29,18 +29,22 @@ Nvidia GPUs can be consumed via container level resource requirements using the
 
 ```yaml
 apiVersion: v1
-kind: pod
-spec:
-  containers:
-    -
+kind: Pod 
+metadata:
+  name: gpu-pod
+spec: 
+  containers: 
+    - 
       name: gpu-container-1
-      resources:
-        limits:
+      image: gcr.io/google_containers/pause:2.0
+      resources: 
+        limits: 
           alpha.kubernetes.io/nvidia-gpu: 2 # requesting 2 GPUs
     -
       name: gpu-container-2
-      resources:
-        limits:
+      image: gcr.io/google_containers/pause:2.0
+      resources: 
+        limits: 
           alpha.kubernetes.io/nvidia-gpu: 3 # requesting 3 GPUs
 ```