Merge branch 'master' into patch-26

docs/user-guide/configmap/README.md

@@ -74,7 +74,7 @@ KUBE_CONFIG_2=value-2
 ## Step Three: Create a pod that sets the command line using ConfigMap
 
 Use the [`command-pod.yaml`](command-pod.yaml) file to create a Pod with a container
-whose command is injected with the keys of a ConfigMap
+whose command is injected with the keys of a ConfigMap:
 
 ```shell
 $ kubectl create -f docs/user-guide/configmap/command-pod.yaml
@@ -89,7 +89,7 @@ value-1 value-2
 
 ## Step Four: Create a pod that consumes a configMap in a volume
 
-Pods can also consume ConfigMaps in volumes.  Use the [`volume-pod.yaml`](volume-pod.yaml) file to create a Pod that consume the ConfigMap in a volume.
+Pods can also consume ConfigMaps in volumes.  Use the [`volume-pod.yaml`](volume-pod.yaml) file to create a Pod that consumes the ConfigMap in a volume.
 
 ```shell
 $ kubectl create -f docs/user-guide/configmap/volume-pod.yaml

docs/user-guide/jobs/work-queue-2/redis-service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: redis
 spec:
   ports:
-    - port: 6379
-      targetPort: 6379
+  - port: 6379
+    targetPort: 6379
   selector:
     app: redis

docs/user-guide/services/load-balancer-sample.yaml

@@ -4,8 +4,8 @@ metadata:
   name: myapp
 spec:
   ports:
-    - port: 8765
-      targetPort: 9376
+  - port: 8765
+    targetPort: 9376
   selector:
     app: example
   type: LoadBalancer

docs/user-guide/services/service-sample.yaml

@@ -4,7 +4,7 @@ metadata:
   name: myapp
 spec:
   ports:
-    - port: 8765
-      targetPort: 9376
+  - port: 8765
+    targetPort: 9376
   selector:
     app: example