Merge pull request #12961 from rhatdan/codespell

Run codespell

13 files changed, 15 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 64e3c6ecb..e08f11bd4 100644
--- a/Makefile
+++ b/Makefile
@@ -282,7 +282,7 @@ test/version/version: .gopathok version/version.go
 
 .PHONY: codespell
 codespell:
-	codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist,ether -w
+	codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist,ether -w
 
 .PHONY: validate
 validate: gofmt lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit
diff --git a/docs/source/markdown/podman-machine-list.1.md b/docs/source/markdown/podman-machine-list.1.md
index d68b8b1ca..b448f890a 100644
--- a/docs/source/markdown/podman-machine-list.1.md
+++ b/docs/source/markdown/podman-machine-list.1.md
@@ -32,7 +32,7 @@ Valid placeholders for the Go template are listed below:
 | .DiskSize       | Disk size of machine            |
 | .LastUp         | Time machine was last up        |
 | .LastUp         | Time since the VM was last run  |
-| .Memory         | Allocated memeory for machine   |
+| .Memory         | Allocated memory for machine   |
 | .Name           | VM name                         |
 | .Running        | Is machine running              |
 | .Stream         | Stream name                     |
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index 5389d05a4..1344fc659 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -274,7 +274,7 @@ func (c *Container) GetInspectMounts(namedVolumes []*ContainerNamedVolume, image
 	return inspectMounts, nil
 }
 
-// GetSecurityOptions retrives and returns the security related annotations and process information upon inspection
+// GetSecurityOptions retrieves and returns the security related annotations and process information upon inspection
 func (c *Container) GetSecurityOptions() []string {
 	ctrSpec := c.config.Spec
 	SecurityOpt := []string{}
diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go
index 2c79f0b7c..f25cbf2cc 100644
--- a/pkg/auth/auth_test.go
+++ b/pkg/auth/auth_test.go
@@ -31,7 +31,7 @@ var largeAuthFileValues = map[string]types.DockerAuthConfig{
 
 // systemContextForAuthFile returns a types.SystemContext with AuthFilePath pointing
 // to a temporary file with fileContents, or nil if fileContents is empty; and a cleanup
-// function the calle rmust arrange to call.
+// function the caller must arrange to call.
 func systemContextForAuthFile(t *testing.T, fileContents string) (*types.SystemContext, func()) {
 	if fileContents == "" {
 		return nil, func() {}
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index af2bad691..9411d8a5f 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -714,7 +714,7 @@ var _ = Describe("Podman containers ", func() {
 		var name = "top"
 		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
-		// Forcably Removing running container should succeed
+		// Forcibly Removing running container should succeed
 		rmResponse, err := containers.Remove(bt.conn, cid, new(containers.RemoveOptions).WithForce(true))
 		Expect(err).To(BeNil())
 		Expect(len(reports.RmReportsErrs(rmResponse))).To(Equal(0))
diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
index c7d857954..3edf3ddf6 100644
--- a/pkg/machine/wsl/machine.go
+++ b/pkg/machine/wsl/machine.go
@@ -567,7 +567,7 @@ func installWslKernel() error {
 		}
 		// In case of unusual circumstances (e.g. race with installer actions)
 		// retry a few times
-		message = "An error occured attempting the WSL Kernel update, retrying..."
+		message = "An error occurred attempting the WSL Kernel update, retrying..."
 		fmt.Println(message)
 		fmt.Fprintln(log, message)
 		time.Sleep(backoff)
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go
index 62b4725a7..91b2599cc 100644
--- a/pkg/specgen/podspecgen.go
+++ b/pkg/specgen/podspecgen.go
@@ -94,7 +94,7 @@ type PodNetworkConfig struct {
 	// Only available if NetNS is set to Bridge or Slirp.
 	// Optional.
 	PortMappings []types.PortMapping `json:"portmappings,omitempty"`
-	// Map of networks names ot ids the container should join to.
+	// Map of networks names to ids the container should join to.
 	// You can request additional settings for each network, you can
 	// set network aliases, static ips, static mac address  and the
 	// network interface name for this container on the specific network.
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index 750fc875d..7f6f79b87 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -223,7 +223,7 @@ type ContainerStorageConfig struct {
 	// Conflicts with Image.
 	// At least one of Image or Rootfs must be specified.
 	Rootfs string `json:"rootfs,omitempty"`
-	// RootfsOverlay tells if rootfs is actuall an overlay on top of base path
+	// RootfsOverlay tells if rootfs is actually an overlay on top of base path
 	RootfsOverlay bool `json:"rootfs_overlay,omitempty"`
 	// ImageVolumeMode indicates how image volumes will be created.
 	// Supported modes are "ignore" (do not create), "tmpfs" (create as
@@ -423,7 +423,7 @@ type ContainerNetworkConfig struct {
 	// PublishExposedPorts is set.
 	// Optional.
 	Expose map[uint16]string `json:"expose,omitempty"`
-	// Map of networks names ot ids the container should join to.
+	// Map of networks names or ids that the container should join.
 	// You can request additional settings for each network, you can
 	// set network aliases, static ips, static mac address  and the
 	// network interface name for this container on the specific network.
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index b6a18a274..8ca7ce4e6 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -893,7 +893,7 @@ func parseSecrets(secrets []string) ([]specgen.Secret, map[string]string, error)
 				source = kv[1]
 			case "type":
 				if secretType != "" {
-					return nil, nil, errors.Wrap(secretParseError, "cannot set more tha one secret type")
+					return nil, nil, errors.Wrap(secretParseError, "cannot set more than one secret type")
 				}
 				if kv[1] != "mount" && kv[1] != "env" {
 					return nil, nil, errors.Wrapf(secretParseError, "type %s is invalid", kv[1])
diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go
index bbebf7949..70e042b4d 100644
--- a/test/e2e/play_build_test.go
+++ b/test/e2e/play_build_test.go
@@ -173,7 +173,7 @@ LABEL marge=mom
 		err = writeYaml(testYAML, filepath.Join(yamlDir, "top.yaml"))
 		Expect(err).To(BeNil())
 
-		// build an image called foobar but make sure it doesnt have
+		// build an image called foobar but make sure it doesn't have
 		// the same label as the yaml buildfile, so we can check that
 		// the image is NOT rebuilt.
 		err = writeYaml(prebuiltImage, filepath.Join(yamlDir, "Containerfile"))
@@ -220,7 +220,7 @@ LABEL marge=mom
 		err = writeYaml(testYAML, filepath.Join(yamlDir, "top.yaml"))
 		Expect(err).To(BeNil())
 
-		// build an image called foobar but make sure it doesnt have
+		// build an image called foobar but make sure it doesn't have
 		// the same label as the yaml buildfile, so we can check that
 		// the image is NOT rebuilt.
 		err = writeYaml(prebuiltImage, filepath.Join(yamlDir, "Containerfile"))
diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go
index 966bc932a..0ac91abd3 100644
--- a/test/e2e/volume_create_test.go
+++ b/test/e2e/volume_create_test.go
@@ -144,7 +144,7 @@ var _ = Describe("Podman volume create", func() {
 		Expect(inspectGID).Should(Exit(0))
 		Expect(inspectGID.OutputToString()).To(Equal(gid))
 
-		// options should containt `uid=3000,gid=4000:3000:4000`
+		// options should contain `uid=3000,gid=4000:3000:4000`
 		optionFormat := `{{ .Options.o }}:{{ .Options.UID }}:{{ .Options.GID }}`
 		optionStrFormatExpect := fmt.Sprintf(`uid=%s,gid=%s:%s:%s`, uid, gid, uid, gid)
 		inspectOpts := podmanTest.Podman([]string{"volume", "inspect", "--format", optionFormat, volName})
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index b6030ba3c..3f2d7f6bb 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -375,7 +375,7 @@ NeedsChown    | true
 
     run_podman run --rm --volume $myvolume:/etc $IMAGE ls /etc/passwd
     run_podman volume inspect --format '{{ .NeedsCopyUp }}' $myvolume
-    is "${output}" "false" "If content in dest '/etc' non-empty NeedsCopyUP should still have happend and be false"
+    is "${output}" "false" "If content in dest '/etc' non-empty NeedsCopyUP should still have happened and be false"
 
     run_podman volume inspect --format '{{.Mountpoint}}' $myvolume
     mountpoint="$output"
diff --git a/troubleshooting.md b/troubleshooting.md
index 2f5eb6552..114a96d41 100644
--- a/troubleshooting.md
+++ b/troubleshooting.md
@@ -689,7 +689,7 @@ file `/etc/systemd/system/user@.service.d/delegate.conf` with the contents:
     [Service]
     Delegate=memory pids cpu io
 
-After logging out and loggin back in, you should have permission to set CPU
+After logging out and logging back in, you should have permission to set CPU
 limits.
 
 ### 26) `exec container process '/bin/sh': Exec format error` (or another binary than `bin/sh`)