fix some typos and resolve conflicts

2016-12-23 03:55:51 -08:00
parent f4ac637e27 ee8c812ef5
commit f535febaa1
56 changed files with 293 additions and 198 deletions
@@ -50,7 +50,7 @@ It's enabled by default. It can be disabled:

 ### Marking add-on as critical

-To be critical an add-on has to run in `kube-system` namespace (cofigurable via flag)
+To be critical an add-on has to run in `kube-system` namespace (configurable via flag)
 and have the following annotations specified:

 * `scheduler.alpha.kubernetes.io/critical-pod` set to empty string