diff --git a/content/writer.go b/content/writer.go index 9f1226824..4c6a1cc29 100644 --- a/content/writer.go +++ b/content/writer.go @@ -25,7 +25,7 @@ type ContentWriter struct { // Write p to the transaction. // // Note that writes are unbuffered to the backing file. When writing, it is -// recommended to wrap in a bufio.Writer or, preferrably, use io.CopyBuffer. +// recommended to wrap in a bufio.Writer or, preferably, use io.CopyBuffer. func (cw *ContentWriter) Write(p []byte) (n int, err error) { n, err = cw.fp.Write(p) cw.digester.Hash().Write(p[:n]) diff --git a/design/mounts.md b/design/mounts.md index 11e64628a..215c23fae 100644 --- a/design/mounts.md +++ b/design/mounts.md @@ -1,11 +1,11 @@ # Mounts -Mounts are the main interaction mechansim in containerD. Container systems of +Mounts are the main interaction mechanism in containerd. Container systems of the past typically end up having several disparate components independently perform mounts, resulting in complex lifecycle management and buggy behavior when coordinating large mount stacks. -In containerD, we intend to keep mount syscalls isolated to the container +In containerd, we intend to keep mount syscalls isolated to the container runtime component, opting to have various components produce a serialized representation of the mount. This ensures that the mounts are performed as a unit and unmounted as a unit. diff --git a/design/snapshots.md b/design/snapshots.md index 2422e94ee..66a48a3fe 100644 --- a/design/snapshots.md +++ b/design/snapshots.md @@ -45,7 +45,7 @@ interface. ## Architecture The _Snapshot Manager_ provides an API for allocating, snapshotting and mounting -abstract, layer-based filesytems. The model works by building up sets of +abstract, layer-based filesystems. The model works by building up sets of directories with parent-child relationships, known as _Snapshots_. Every snapshot is represented by an opaque `diff` directory, which acts as a diff --git a/events/topic.go b/events/topic.go index 053ef9da5..5f371a118 100644 --- a/events/topic.go +++ b/events/topic.go @@ -4,7 +4,7 @@ import "context" type topicKey struct{} -// WithTopic returns a context with a new topic set, such that events emmited +// WithTopic returns a context with a new topic set, such that events emitted // from the resulting context will be marked with the topic. // // A topic groups events by the target module they operate on. This is @@ -13,7 +13,7 @@ type topicKey struct{} // When compacting the journal, we can replace all former log entries with a // summary data structure that will result in the same state. // -// By providing a compaction mechansim by topic, we can prune down to a data +// By providing a compaction mechanism by topic, we can prune down to a data // structure oriented towards a single topic, leaving unrelated messages alone. func WithTopic(ctx context.Context, topic string) context.Context { return context.WithValue(ctx, topicKey{}, topic) diff --git a/snapshot/manager.go b/snapshot/manager.go index ce4c40113..5c5b039ac 100644 --- a/snapshot/manager.go +++ b/snapshot/manager.go @@ -11,7 +11,7 @@ import ( ) // Manager provides an API for allocating, snapshotting and mounting -// abstract, layer-based filesytems. The model works by building up sets of +// abstract, layer-based filesystems. The model works by building up sets of // directories with parent-child relationships. // // These differ from the concept of the graphdriver in that the @@ -203,7 +203,7 @@ func (lm *Manager) Prepare(dst, parent string) ([]containerd.Mount, error) { }, nil } -// View behaves identically to Prepare except the result may not be commited +// View behaves identically to Prepare except the result may not be committed // back to the snappshot manager. // // Whether or not these are readonly mounts is implementation specific, but the