Merge pull request #5407 from rhatdan/codespell

Fix spelling mistakes in code found by codespell

15 files changed, 21 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 7baca10d5..7914cb163 100644
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,7 @@ man-page-check:
 
 .PHONY: codespell
 codespell:
-	codespell -S bin,vendor,.git,go.sum,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked
+	codespell -S bin,vendor,.git,go.sum,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist -w
 
 # When publishing releases include critical build-time details
 .PHONY: release.txt
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 08d32df18..11b2bd027 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -494,7 +494,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 	if data != nil {
 		configEnv, err := envLib.ParseSlice(data.Config.Env)
 		if err != nil {
-			return nil, errors.Wrap(err, "error pasing image environment variables")
+			return nil, errors.Wrap(err, "error passing image environment variables")
 		}
 		env = envLib.Join(env, configEnv)
 	}
diff --git a/contrib/cirrus/packer/libpod_base_images.yml b/contrib/cirrus/packer/libpod_base_images.yml
index 21f3795f1..255723d57 100644
--- a/contrib/cirrus/packer/libpod_base_images.yml
+++ b/contrib/cirrus/packer/libpod_base_images.yml
@@ -12,7 +12,7 @@ variables:
     # Required for output from qemu builders
     TTYDEV:
 
-    # Ubuntu releases are mearly copied to this project for control purposes
+    # Ubuntu releases are merely copied to this project for control purposes
     UBUNTU_BASE_IMAGE:
     PRIOR_UBUNTU_BASE_IMAGE:
 
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md
index 3f0bfc57b..e08eebc24 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -282,8 +282,8 @@ Add an image *label* (e.g. label=*value*) to the image metadata. Can be used mul
 Users can set a special LABEL **io.containers.capabilities=CAP1,CAP2,CAP3** in
 a Containerfile that specified the list of Linux capabilities required for the
 container to run properly. This label specified in a container image tells
-Podman to run the container with just these capabilties. Podman launches the
-container with just the specified capabilties, as long as this list of
+Podman to run the container with just these capabilities. Podman launches the
+container with just the specified capabilities, as long as this list of
 capabilities is a subset of the default list.
 
 If the specified capabilities are not in the default set, Podman will
diff --git a/libpod/config/config.go b/libpod/config/config.go
index c72a0efc7..5d59f1bf2 100644
--- a/libpod/config/config.go
+++ b/libpod/config/config.go
@@ -437,7 +437,7 @@ func probeConmon(conmonBinary string) error {
 // with cgroupsv2. Other OCI runtimes are not yet supporting cgroupsv2. This
 // might change in the future.
 func NewConfig(userConfigPath string) (*Config, error) {
-	// Start with the default config and interatively merge fields in the system
+	// Start with the default config and iteratively merge fields in the system
 	// configs.
 	config, err := defaultConfigFromMemory()
 	if err != nil {
diff --git a/libpod/container_api.go b/libpod/container_api.go
index dc7470f1a..5e8fcea47 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -412,7 +412,7 @@ func (c *Container) Attach(streams *AttachStreams, keys string, resize <-chan re
 // HTTPAttach forwards an attach session over a hijacked HTTP session.
 // HTTPAttach will consume and close the included httpCon, which is expected to
 // be sourced from a hijacked HTTP connection.
-// The cancel channel is optional, and can be used to asyncronously cancel the
+// The cancel channel is optional, and can be used to asynchronously cancel the
 // attach session.
 // The streams variable is only supported if the container was not a terminal,
 // and allows specifying which of the container's standard streams will be
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index a543a19c0..50ae72499 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -670,8 +670,8 @@ type InspectAdditionalNetwork struct {
 	// DriverOpts is presently unused and maintained exclusively for
 	// compatibility.
 	DriverOpts map[string]string `json:"DriverOpts"`
-	// IPAMConfig is presently unused and maintained exlusively for
-	// compabitility.
+	// IPAMConfig is presently unused and maintained exclusively for
+	// compatibility.
 	IPAMConfig map[string]string `json:"IPAMConfig"`
 	// Links is presently unused and maintained exclusively for
 	// compatibility.
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 67e02cc31..60b13f125 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -929,7 +929,7 @@ func (c *Container) completeNetworkSetup() error {
 		return err
 	}
 	for _, line := range strings.Split(string(b), "\n") {
-		// only keep things that dont start with nameserver from the old
+		// only keep things that don't start with nameserver from the old
 		// resolv.conf file
 		if !strings.HasPrefix(line, "nameserver") {
 			outResolvConf = append([]string{line}, outResolvConf...)
diff --git a/libpod/oci.go b/libpod/oci.go
index e5f9b2135..41d420664 100644
--- a/libpod/oci.go
+++ b/libpod/oci.go
@@ -55,7 +55,7 @@ type OCIRuntime interface {
 	// to output; otherwise, STDOUT and STDERR will be multiplexed, with
 	// a header prepended as follows: 1-byte STREAM (0, 1, 2 for STDIN,
 	// STDOUT, STDERR), 3 null (0x00) bytes, 4-byte big endian length.
-	// If a cancel channel is provided, it can be used to asyncronously
+	// If a cancel channel is provided, it can be used to asynchronously
 	// termninate the attach session. Detach keys, if given, will also cause
 	// the attach session to be terminated if provided via the STDIN
 	// channel. If they are not provided, the default detach keys will be
diff --git a/pkg/api/handlers/generic/images.go b/pkg/api/handlers/generic/images.go
index 3da5807ec..078896834 100644
--- a/pkg/api/handlers/generic/images.go
+++ b/pkg/api/handlers/generic/images.go
@@ -90,7 +90,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 		})
 	}
 
-	//FIXME/TODO to do this exacty correct, pruneimages needs to return idrs and space-reclaimed, then we are golden
+	//FIXME/TODO to do this exactly correct, pruneimages needs to return idrs and space-reclaimed, then we are golden
 	ipr := types.ImagesPruneReport{
 		ImagesDeleted:  idr,
 		SpaceReclaimed: 1, // TODO we cannot supply this right now
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index e8dc5bde2..ee697b6b7 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -181,7 +181,7 @@ func PodStop(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// TODO we need to implement a pod.State/Status in libpod internal so libpod api
-	// users dont have to run through all containers.
+	// users don't have to run through all containers.
 	podContainers, err := pod.AllContainers()
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
@@ -227,7 +227,7 @@ func PodStart(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// TODO we need to implement a pod.State/Status in libpod internal so libpod api
-	// users dont have to run through all containers.
+	// users don't have to run through all containers.
 	podContainers, err := pod.AllContainers()
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
diff --git a/pkg/api/tags.yaml b/pkg/api/tags.yaml
index 3bf2bb64f..571f49e44 100644
--- a/pkg/api/tags.yaml
+++ b/pkg/api/tags.yaml
@@ -18,4 +18,4 @@ tags:
     - name: images (compat)
       description: Actions related to images for the compatibility endpoints
     - name: system (compat)
-      description: Actions related to Podman and compatiblity engines
+      description: Actions related to Podman and compatibility engines
diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go
index 0baf0cb20..17b3b254a 100644
--- a/pkg/bindings/test/images_test.go
+++ b/pkg/bindings/test/images_test.go
@@ -140,7 +140,7 @@ var _ = Describe("Podman images", func() {
 		code, _ := bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
-		// Validates if the image is tagged sucessfully.
+		// Validates if the image is tagged successfully.
 		err = images.Tag(bt.conn, alpine.shortName, "demo", alpine.shortName)
 		Expect(err).To(BeNil())
 
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index a0099753b..7e29265b7 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -115,7 +115,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 
 		// Binding needs to be modified to inspect the pod state.
-		// Since we dont have a pod state we inspect the states of the containers within the pod.
+		// Since we don't have a pod state we inspect the states of the containers within the pod.
 		// Pause a valid container
 		err = pods.Pause(bt.conn, newpod)
 		Expect(err).To(BeNil())
@@ -195,7 +195,7 @@ var _ = Describe("Podman pods", func() {
 		}
 	})
 
-	// Test to validate all the pods in the stopped/exited state are pruned sucessfully.
+	// Test to validate all the pods in the stopped/exited state are pruned successfully.
 	It("prune pod", func() {
 		// Add a new pod
 		var newpod2 string = "newpod2"
diff --git a/pkg/spec/security.go b/pkg/spec/security.go
index ca025eb3e..0f8d36f00 100644
--- a/pkg/spec/security.go
+++ b/pkg/spec/security.go
@@ -128,10 +128,10 @@ func (c *SecurityConfig) ConfigureGenerator(g *generate.Generator, user *UserCon
 	privCapRequired := []string{}
 
 	if !c.Privileged && len(c.CapRequired) > 0 {
-		// Pass CapRequired in CapAdd field to normalize capabilties names
+		// Pass CapRequired in CapAdd field to normalize capabilities names
 		capRequired, err := capabilities.MergeCapabilities(nil, c.CapRequired, nil)
 		if err != nil {
-			logrus.Errorf("capabilties requested by user or image are not valid: %q", strings.Join(c.CapRequired, ","))
+			logrus.Errorf("capabilities requested by user or image are not valid: %q", strings.Join(c.CapRequired, ","))
 		} else {
 			// Verify all capRequiered are in the defaultCapList
 			for _, cap := range capRequired {
@@ -143,7 +143,7 @@ func (c *SecurityConfig) ConfigureGenerator(g *generate.Generator, user *UserCon
 		if len(privCapRequired) == 0 {
 			defaultCaplist = capRequired
 		} else {
-			logrus.Errorf("capabilties requested by user or image are not allowed by default: %q", strings.Join(privCapRequired, ","))
+			logrus.Errorf("capabilities requested by user or image are not allowed by default: %q", strings.Join(privCapRequired, ","))
 		}
 	}
 	configSpec.Process.Capabilities.Bounding = defaultCaplist