Merge pull request #3590 from tanjunchen/fix-grammar-mistake

crosbymichael · web-flow · commit d177ffd309ba · 2019-08-28T10:39:20.000-04:00
fix-grammar-mistake
diff --git a/containers/containers.go b/containers/containers.go
@@ -49,7 +49,7 @@ type Container struct {
 	// This property is required and immutable.
 	Runtime RuntimeInfo
 
-	// Spec should carry the the runtime specification used to implement the
+	// Spec should carry the runtime specification used to implement the
 	// container.
 	//
 	// This field is required but mutable.
diff --git a/docs/namespaces.md b/docs/namespaces.md
@@ -64,7 +64,7 @@ Note that currently only these two labels are used to configure the defaults and
 
 If we need to inspect containers, images, or other resources in various namespaces the `ctr` tool allows you to do this.
 Simply set the `--namespace,-n` flag on `ctr` to change the namespace. If you do not provide a namespace, `ctr` client commands
-will all use the the default namespace, which is simply named "`default`".
+will all use the default namespace, which is simply named "`default`".
 
 ```bash
 > sudo ctr -n docker tasks
diff --git a/log/context.go b/log/context.go
@@ -30,7 +30,7 @@ var (
 	// messages.
 	G = GetLogger
 
-	// L is an alias for the the standard logger.
+	// L is an alias for the standard logger.
 	L = logrus.NewEntry(logrus.StandardLogger())
 )
 
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -118,7 +118,7 @@ func WithDefaultSpecForPlatform(platform string) SpecOpts {
 	}
 }
 
-// WithSpecFromBytes loads the the spec from the provided byte slice.
+// WithSpecFromBytes loads the spec from the provided byte slice.
 func WithSpecFromBytes(p []byte) SpecOpts {
 	return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
 		*s = Spec{} // make sure spec is cleared.
@@ -628,7 +628,7 @@ func WithUserID(uid uint32) SpecOpts {
 }
 
 // WithUsername sets the correct UID and GID for the container
-// based on the the image's /etc/passwd contents. If /etc/passwd
+// based on the image's /etc/passwd contents. If /etc/passwd
 // does not exist, or the username is not found in /etc/passwd,
 // it returns error.
 func WithUsername(username string) SpecOpts {
diff --git a/platforms/platforms.go b/platforms/platforms.go
@@ -130,7 +130,7 @@ type Matcher interface {
 // specification. The returned matcher only looks for equality based on os,
 // architecture and variant.
 //
-// One may implement their own matcher if this doesn't provide the the required
+// One may implement their own matcher if this doesn't provide the required
 // functionality.
 //
 // Applications should opt to use `Match` over directly parsing specifiers.
diff --git a/reports/2017-02-10.md b/reports/2017-02-10.md
@@ -38,7 +38,7 @@ much smaller interface!
 ## Bundles Bundles Bundles
 
 We spend time talking with people implementing Windows support as well as a few other users.
-One the the major issues with our current approach was that bundles were a central part of our architecture.
+One the major issues with our current approach was that bundles were a central part of our architecture.
 The content and storage subsystems would produce bundles and the execution subsystem would consume them.
 However, with a bundle being on the filesystem, having this concept does not work as smoothly on Windows
 as it would for Unix platforms.

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ var (`
`30`	`30`	`// messages.`
`31`	`31`	`G = GetLogger`
`32`	`32`
`33`		`- // L is an alias for the the standard logger.`
	`33`	`+ // L is an alias for the standard logger.`
`34`	`34`	`L = logrus.NewEntry(logrus.StandardLogger())`
`35`	`35`	`)`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func WithDefaultSpecForPlatform(platform string) SpecOpts {`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`-// WithSpecFromBytes loads the the spec from the provided byte slice.`
	`121`	`+// WithSpecFromBytes loads the spec from the provided byte slice.`
`122`	`122`	`func WithSpecFromBytes(p []byte) SpecOpts {`
`123`	`123`	`return func(_ context.Context, _ Client, _ containers.Container, s Spec) error {`
`124`	`124`	`*s = Spec{} // make sure spec is cleared.`
`@@ -628,7 +628,7 @@ func WithUserID(uid uint32) SpecOpts {`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`// WithUsername sets the correct UID and GID for the container`
`631`		`-// based on the the image's /etc/passwd contents. If /etc/passwd`
	`631`	`+// based on the image's /etc/passwd contents. If /etc/passwd`
`632`	`632`	`// does not exist, or the username is not found in /etc/passwd,`
`633`	`633`	`// it returns error.`
`634`	`634`	`func WithUsername(username string) SpecOpts {`