diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-10-24 10:17:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 10:17:27 -0700 |
| commit | 38100fe2cb4857ad5944e6dce24acebead5ac6a1 (patch) | |
| tree | 1dc6e0e1d641c259c985c78706a7f76f91c172b2 | |
| parent | 29fca6ca896920bd1c0d3bc4b51ac49e103a94d9 (diff) | |
| parent | 8204f3a9b6c99785108b0f1390b1ebe1c2ef87e0 (diff) | |
Merge pull request #1264 from zhxcai/typo
Automatic merge from submit-queue.
fix some typos
4 files changed, 4 insertions, 4 deletions
diff --git a/contributors/design-proposals/api-machinery/protobuf.md b/contributors/design-proposals/api-machinery/protobuf.md index 6741bbab..1203c42f 100644 --- a/contributors/design-proposals/api-machinery/protobuf.md +++ b/contributors/design-proposals/api-machinery/protobuf.md @@ -301,7 +301,7 @@ that the returned value is not in the known type. We add the `contentEncoding` field here to preserve room for future optimizations like encryption-at-rest or compression of the nested content. Clients should error when receiving an encoding they do not support. -Negotioting encoding is not defined here, but introducing new encodings +Negotiating encoding is not defined here, but introducing new encodings is similar to introducing a schema change or new API version. A client should use the `kind` and `apiVersion` fields to identify the diff --git a/contributors/design-proposals/api-machinery/server-get.md b/contributors/design-proposals/api-machinery/server-get.md index fb508a3c..085feb41 100644 --- a/contributors/design-proposals/api-machinery/server-get.md +++ b/contributors/design-proposals/api-machinery/server-get.md @@ -18,7 +18,7 @@ schema). `get` supports a `wide` mode that includes additional columns. Users ca flag. Headers corresponding to the columns are optionally displayed. `kubectl describe` shows a textual representation of individual objects that describes individual fields as subsequent -lines and uses indendation and nested tables to convey deeper structure on the resource (such as events for a pod or +lines and uses indentation and nested tables to convey deeper structure on the resource (such as events for a pod or each container). It sometimes retrieves related objects like events, pods for a replication controller, or autoscalers for a deployment. It supports no significant flags. diff --git a/contributors/design-proposals/api-machinery/synchronous-garbage-collection.md b/contributors/design-proposals/api-machinery/synchronous-garbage-collection.md index 6f2a9be5..7cc78ece 100644 --- a/contributors/design-proposals/api-machinery/synchronous-garbage-collection.md +++ b/contributors/design-proposals/api-machinery/synchronous-garbage-collection.md @@ -124,7 +124,7 @@ In addition, if an object popped from `dirtyQueue` is marked as "GC in progress" * To avoid racing with another controller, it requeues the object if `observedGeneration < Generation`. This is best-effort, see [unhandled cases](#unhandled-cases). * Checks if the object has dependents * If not, send a PUT request to remove the `GCFinalizer`; - * If so, then add all dependents to the `dirtryQueue`; we need bookkeeping to avoid adding the dependents repeatedly if the owner gets in the `synchronousGC queue` multiple times. + * If so, then add all dependents to the `dirtyQueue`; we need bookkeeping to avoid adding the dependents repeatedly if the owner gets in the `synchronousGC queue` multiple times. ## Controllers diff --git a/contributors/design-proposals/architecture/0000-kep-template.md b/contributors/design-proposals/architecture/0000-kep-template.md index 8ba4da4a..764fff73 100644 --- a/contributors/design-proposals/architecture/0000-kep-template.md +++ b/contributors/design-proposals/architecture/0000-kep-template.md @@ -77,7 +77,7 @@ superseded-by: ## Table of Contents A table of contents is helpful for quickly jumping to sections of a KEP and for -highlighting any addtional information provided beyond the standard KEP +highlighting any additional information provided beyond the standard KEP template. [Tools for generating][] a table of contents from markdown are available. |
