Merge branch 'master' into patch-15

docs/concepts/configuration/assign-pod-node.md

@@ -253,9 +253,25 @@ A toleration "matches" a taint if the `key`s are the same and the `effect`s are
 * the `operator` is `Exists` (in which case no `value` should be specified), or
 * the `operator` is `Equal` and the `value`s are equal
 
-(`Operator` defaults to `Equal` if not specified.)
-As a special case, an empty `key` with operator `Exists` matches all keys and all values.
-Also as a special case, empty `effect` matches all effects.
+`Operator` defaults to `Equal` if not specified.
+
+**NOTE:** There are two special cases:
+
+* An empty `key` with operator `Exists` matches all keys, values and effects which means this
+will tolerate everything.
+
+```yaml
+tolerations:
+- operator: "Exists"
+```
+
+* An empty `effect` matches all effects with key `key`.
+
+```yaml
+tolerations:
+- key: "key"
+  operator: "Exists"
+```
 
 The above example used `effect` of `NoSchedule`. Alternatively, you can use `effect` of `PreferNoSchedule`.
 This is a "preference" or "soft" version of `NoSchedule` -- the system will *try* to avoid placing a

docs/concepts/workloads/controllers/replicationcontroller.md

@@ -86,7 +86,7 @@ specifies an expression that just gets the name from each pod in the returned li
 
 ## Writing a ReplicationController Spec
 
-As with all other Kubernetes config, a Job needs `apiVersion`, `kind`, and `metadata` fields.  For
+As with all other Kubernetes config, a ReplicationController needs `apiVersion`, `kind`, and `metadata` fields.  For
 general information about working with config files, see [here](/docs/user-guide/simple-yaml/),
 [here](/docs/user-guide/configuring-containers/), and [here](/docs/concepts/tools/kubectl/object-management-overview/).
 

docs/getting-started-guides/kubeadm.md

@@ -164,7 +164,7 @@ init`.
 There are pod network implementations where the master also plays a role in
 allocating a set of network address space for each node.  When using
 [flannel](https://github.com/coreos/flannel) as the [pod network](#pod-network)
-(described in step 3), specify `--pod-network-cidr 10.244.0.0/16`. _This is not
+(described in step 3), specify `--pod-network-cidr=10.244.0.0/16`. _This is not
 required for any other networks besides Flannel._
 
 Please refer to the [kubeadm reference doc](/docs/admin/kubeadm/) if you want to

docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md

@@ -13,9 +13,11 @@ On the Google Compute Engine (GCE) platform, the default logging support targets
 in the [Logging With Stackdriver Logging](/docs/user-guide/logging/stackdriver).
 
 This article describes how to set up a cluster to ingest logs into
-[Elasticsearch](https://www.elastic.co/products/elasticsearch), and view
+[Elasticsearch](https://www.elastic.co/products/elasticsearch) and view
 them using [Kibana](https://www.elastic.co/products/kibana), as an alternative to
-Stackdriver Logging when running on GCE. Note that Elasticsearch and Kibana do not work with Kubernetes clusters hosted on Google Container Engine.
+Stackdriver Logging when running on GCE. Note that Elasticsearch and Kibana
+cannot be setup automatically in the Kubernetes cluster hosted on
+Google Container Engine, you have to deploy it manually.
 
 To use Elasticsearch and Kibana for cluster logging, you should set the
 following environment variable as shown below when creating your cluster with

docs/tasks/run-application/run-stateless-application-deployment.md

@@ -136,7 +136,7 @@ Delete the deployment by name:
 
 The preferred way to create a replicated application is to use a Deployment,
 which in turn uses a ReplicaSet. Before the Deployment and ReplicaSet were
-added to Kubernetes, replicated applicatios were configured by using a
+added to Kubernetes, replicated applications were configured by using a
 [ReplicationController](/docs/concepts/workloads/controllers/replicationcontroller/).
 
 {% endcapture %}