Merge branch 'master' of github.com:coreos/etcd

Documentation/optimal-cluster-size.md

@@ -28,11 +28,11 @@ The other important cluster optimization is to always have an odd active cluster
 |--------------|------------|-------------------|
 | 1 peers      | 1 peers    | None              |
 | 3 peers      | 2 peers    | 1 peer            |
-| 4 peers      | 3 peers    | 2 peers           |
-| 5 peers      | 3 peers    | **3 peers**       |
+| 4 peers      | 3 peers    | 1 peer           |
+| 5 peers      | 3 peers    | **2 peers**       |
 | 6 peers      | 4 peers    | 2 peers           |
 | 7 peers      | 4 peers    | **3 peers**       |
 | 8 peers      | 5 peers    | 3 peers           |
 | 9 peers      | 5 peers    | **4 peers**       |
 
-As you can see, adding another peer to bring the number of active peers up to an odd size is always worth it. During a network partition, an odd number of active peers also guarantees that there will almost always be a majority of the cluster that can continue to operate and be the source of truth when the partition ends.
+As you can see, adding another peer to bring the number of active peers up to an odd size is always worth it. During a network partition, an odd number of active peers also guarantees that there will almost always be a majority of the cluster that can continue to operate and be the source of truth when the partition ends.