Typos and englishify user-guide

2016-09-06 13:07:12 +02:00
parent 6b61d2ba0b
commit 7112d4c53d
24 changed files with 40 additions and 41 deletions
@@ -78,7 +78,7 @@ nginx-deployment-2035384211-qqcnn   1/1       Running   0          18s       app

 The created Replica Set will ensure that there are three nginx Pods at all times.

-**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each others and won't behave correctly.
+**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each other's and won't behave correctly.

 ## The Status of a Deployment

@@ -503,7 +503,7 @@ number of Pods are less than the desired number.

 Note that you should not create other pods whose labels match this selector, either directly, via another Deployment or via another controller such as Replica Sets or Replication Controllers. Otherwise, the Deployment will think that those pods were created by it. Kubernetes will not stop you from doing this.

-If you have multiple controllers that have overlapping selectors, the controllers will fight with each others and won't behave correctly.
+If you have multiple controllers that have overlapping selectors, the controllers will fight with each other's and won't behave correctly.

 ### Strategy