From ba600760dbc4e9e8b888e116004fe0889f55e64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=8F?= Date: Thu, 26 Oct 2017 18:02:40 +0800 Subject: some mistake spelling --- contributors/design-proposals/cli/apply_refactor.md | 2 +- contributors/design-proposals/cli/multi-fields-merge-key.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contributors/design-proposals/cli/apply_refactor.md b/contributors/design-proposals/cli/apply_refactor.md index 345a48ae..8f9ca6da 100644 --- a/contributors/design-proposals/cli/apply_refactor.md +++ b/contributors/design-proposals/cli/apply_refactor.md @@ -150,7 +150,7 @@ Because of the way diff is implemented with 2-way diffs, a simple bit of logic is also executed to compare last-applied to local, but with the local argument differing in location. To compare local to remote means understanding what will happen when the same code is executed comparing last-applied to local, and then putting in the appropriate guards to short-circuit the -logic in one context or the other as needed. last-appied and remote are not compared directly, and instead +logic in one context or the other as needed. last-applied and remote are not compared directly, and instead are only compared indirectly when the 2 diff results are merged. Information that is redundant or should be checked for consistency across all 3 sources (e.g. checking for conflicts) is spread across 3 logic locations - the first 2-way diff, the second 2-way diff and the merge of the 2 diffs. diff --git a/contributors/design-proposals/cli/multi-fields-merge-key.md b/contributors/design-proposals/cli/multi-fields-merge-key.md index 13dcf9ce..229a1021 100644 --- a/contributors/design-proposals/cli/multi-fields-merge-key.md +++ b/contributors/design-proposals/cli/multi-fields-merge-key.md @@ -35,7 +35,7 @@ That part will be addressed by [#476](https://github.com/kubernetes/community/pu ### API Change -If a merge key has multiple fields, it will be a string of merge key fields seperated by ",", i.e. `patchMergeKey:",,"`. +If a merge key has multiple fields, it will be a string of merge key fields separated by ",", i.e. `patchMergeKey:",,"`. If a merge key only has one field, it will be the same as before, i.e. `patchMergeKey:""`. -- cgit v1.2.3