Merge branch 'master' into release-1.8

docs/tasks/access-application-cluster/service-access-application-cluster.md

@@ -105,7 +105,7 @@ provides load balancing for an application that has two running instances.
 
 1. Use the node address and node port to access the Hello World application:
 
-        curl http://<public-node-ip>:<node-port>
+       curl http://<public-node-ip>:<node-port>
 
     where `<public-node-ip>` is the public IP address of your node,
     and `<node-port>` is the NodePort value for your service.

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

@@ -104,7 +104,7 @@ To create a new secret perform the following steps:
 1. Generate a 32 byte random key and base64 encode it. If you're on Linux or Mac OS X, run the following command:
 
     ```
-    head -c 32 /dev/urandom | base64 -i - -o -
+    head -c 32 /dev/urandom | base64
     ```
 
 2. Place that value in the secret field.  

docs/tasks/administer-federation/ingress.md

@@ -230,7 +230,7 @@ In particular, Federated ReplicaSets ensure that the desired number of
 pods are kept running in each cluster, even in the event of node
 failures.  In the event of entire cluster or availability zone
 failures, Federated ReplicaSets automatically place additional
-replacas in the other available clusters in the federation to accommodate the
+replicas in the other available clusters in the federation to accommodate the
 traffic which was previously being served by the now unavailable
 cluster. While the Federated ReplicaSet ensures that sufficient replicas are
 kept running, the Federated Ingress ensures that user traffic is
@@ -256,7 +256,7 @@ Check that:
 1. Your clusters are correctly registered in the Cluster Federation API (`kubectl describe clusters`)
 2. Your clusters are all 'Active'.  This means that the cluster
    Federation system was able to connect and authenticate against the
-   clusters' endpoints.  If not, consult the event logs of the federation-controller-manager pod to ascertain what the failure might be. (`kubectl --namespace=federation logs $(kubectl get pods --namespace=federation -l module=federation-controller-manager -oname`)
+   clusters' endpoints.  If not, consult the event logs of the federation-controller-manager pod to ascertain what the failure might be. (`kubectl --namespace=federation logs $(kubectl get pods --namespace=federation -l module=federation-controller-manager -o name`)
 3. That the login credentials provided to the Cluster Federation API
    for the clusters have the correct authorization and quota to create
    ingresses/services/replicasets in the relevant namespace in the

docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md

@@ -207,8 +207,8 @@ ports:
 
 livenessProbe:
   httpGet:
-  path: /healthz
-  port: liveness-port
+    path: /healthz
+    port: liveness-port
 ```
 
 ## Define readiness probes

docs/tasks/federation/federation-service-discovery.md

@@ -356,7 +356,7 @@ how to bring up a cluster federation correctly (or have your cluster administrat
 Check that:
 
 1. Your clusters are correctly registered in the Cluster Federation API (`kubectl describe clusters`)
-2. Your clusters are all 'Active'.  This means that the cluster Federation system was able to connect and authenticate against the clusters' endpoints.  If not, consult the logs of the federation-controller-manager pod to ascertain what the failure might be. (`kubectl --namespace=federation logs $(kubectl get pods --namespace=federation -l module=federation-controller-manager -oname`)
+2. Your clusters are all 'Active'.  This means that the cluster Federation system was able to connect and authenticate against the clusters' endpoints.  If not, consult the logs of the federation-controller-manager pod to ascertain what the failure might be. (`kubectl --namespace=federation logs $(kubectl get pods --namespace=federation -l module=federation-controller-manager -o name`)
 3. That the login credentials provided to the Cluster Federation API for the clusters have the correct authorization and quota to create services in the relevant namespace in the clusters.  Again you should see associated error messages providing more detail in the above log file if this is not the case.
 4. Whether any other error is preventing the service creation operation from succeeding (look for `service-controller` errors in the output of `kubectl logs federation-controller-manager --namespace federation`).
 

docs/tasks/run-application/run-single-instance-stateful-application.md

@@ -157,7 +157,7 @@ behind a Service and you don't intend to increase the number of Pods.
 Run a MySQL client to connect to the server:
 
 ```
-kubectl run -it --rm --image=mysql:5.6 mysql-client -- mysql -h <pod-ip> -ppassword
+kubectl run -it --rm --image=mysql:5.6 mysql-client -- mysql -h <pod-ip> -p <password>
 ```
 
 This command creates a new Pod in the cluster running a mysql client