9 files changed, 10 insertions, 11 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index 608a279c3..4918bf57a 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -2235,7 +2235,7 @@ func (s *BoltState) RemovePodContainers(pod *Pod) error {
 			if ctr == nil {
 				// This should never happen
 				// State is inconsistent
-				return errors.Wrapf(define.ErrNoSuchCtr, "pod %s referenced nonexistant container %s", pod.ID(), string(id))
+				return errors.Wrapf(define.ErrNoSuchCtr, "pod %s referenced nonexistent container %s", pod.ID(), string(id))
 			}
 			ctrDeps := ctr.Bucket(dependenciesBkt)
 			// This should never be nil, but if it is, we're
diff --git a/libpod/events/config.go b/libpod/events/config.go
index 453c64f8c..20c01baff 100644
--- a/libpod/events/config.go
+++ b/libpod/events/config.go
@@ -167,7 +167,7 @@ type EventFilter func(*Event) bool
 
 var (
 	// ErrEventTypeBlank indicates the event log found something done by podman
-	// but it isnt likely an event
+	// but it isn't likely an event
 	ErrEventTypeBlank = errors.New("event type blank")
 
 	// ErrEventNotFound indicates that the event was not found in the event log
diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go
index e9c950713..b42e7d16a 100644
--- a/libpod/healthcheck.go
+++ b/libpod/healthcheck.go
@@ -31,7 +31,7 @@ const (
 	// HealthCheckNotDefined means the container has no health
 	// check defined in it
 	HealthCheckNotDefined HealthCheckStatus = iota
-	// HealthCheckInternalError means somes something failed obtaining or running
+	// HealthCheckInternalError means some something failed obtaining or running
 	// a given health check
 	HealthCheckInternalError HealthCheckStatus = iota
 	// HealthCheckDefined means the healthcheck was found on the container
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index 99c11e3ff..326a23f4c 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -330,7 +330,7 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa
 		if goal.usedSearchRegistries && len(goal.searchedRegistries) == 0 {
 			return nil, errors.Errorf("image name provided is a short name and no search registries are defined in the registries config file.")
 		}
-		// If the image passed in was fully-qualified, we will have 1 refpair.  Bc the image is fq'd, we dont need to yap about registries.
+		// If the image passed in was fully-qualified, we will have 1 refpair.  Bc the image is fq'd, we don't need to yap about registries.
 		if !goal.usedSearchRegistries {
 			if pullErrors != nil && len(pullErrors.Errors) > 0 { // this should always be true
 				return nil, errors.Wrap(pullErrors.Errors[0], "unable to pull image")
diff --git a/libpod/kube.go b/libpod/kube.go
index 47a77991e..6ae3e3d07 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -341,7 +341,7 @@ func libpodMountsToKubeVolumeMounts(c *Container) ([]v1.VolumeMount, []v1.Volume
 	return vms, vos, nil
 }
 
-// generateKubeVolumeMount takes a user specfied mount and returns
+// generateKubeVolumeMount takes a user specified mount and returns
 // a kubernetes VolumeMount (to be added to the container) and a kubernetes Volume
 // (to be added to the pod)
 func generateKubeVolumeMount(m specs.Mount) (v1.VolumeMount, v1.Volume, error) {
diff --git a/libpod/lock/shm/shm_lock.c b/libpod/lock/shm/shm_lock.c
index fbb3f57cc..95052c40f 100644
--- a/libpod/lock/shm/shm_lock.c
+++ b/libpod/lock/shm/shm_lock.c
@@ -145,7 +145,7 @@ shm_struct_t *setup_lock_shm(char *path, uint32_t num_locks, int *error_code) {
 
   // Set mutexes to robust - if a process dies while holding a mutex, we'll get
   // a special error code on the next attempt to lock it.
-  // This should prevent panicing processes from leaving the state unusable.
+  // This should prevent panicking processes from leaving the state unusable.
   ret_code = pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST);
   if (ret_code != 0) {
     *error_code = -1 * ret_code;
@@ -298,7 +298,7 @@ int32_t close_lock_shm(shm_struct_t *shm) {
 // Allocate the first available semaphore
 // Returns a positive integer guaranteed to be less than UINT32_MAX on success,
 // or negative errno values on failure
-// On sucess, the returned integer is the number of the semaphore allocated
+// On success, the returned integer is the number of the semaphore allocated
 int64_t allocate_semaphore(shm_struct_t *shm) {
   int ret_code, i;
   bitmap_t test_map;
diff --git a/libpod/options.go b/libpod/options.go
index 00b5626b4..bfbbb9e2d 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -386,8 +386,7 @@ func WithNamespace(ns string) RuntimeOption {
 
 // WithVolumePath sets the path under which all named volumes
 // should be created.
-// The path changes based on whethe rthe user is running as root
-// or not.
+// The path changes based on whether the user is running as root or not.
 func WithVolumePath(volPath string) RuntimeOption {
 	return func(rt *Runtime) error {
 		if rt.valid {
diff --git a/libpod/pod_api.go b/libpod/pod_api.go
index 3a194f04b..b27257004 100644
--- a/libpod/pod_api.go
+++ b/libpod/pod_api.go
@@ -445,7 +445,7 @@ func (p *Pod) Inspect() (*PodInspect, error) {
 	}
 	for _, c := range containers {
 		containerStatus := "unknown"
-		// Ignoring possible errors here because we dont want this to be
+		// Ignoring possible errors here because we don't want this to be
 		// catastrophic in nature
 		containerState, err := c.State()
 		if err == nil {
diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go
index a6ab748e5..835dccf9c 100644
--- a/libpod/runtime_volume.go
+++ b/libpod/runtime_volume.go
@@ -59,7 +59,7 @@ func (r *Runtime) GetVolume(name string) (*Volume, error) {
 	return vol, nil
 }
 
-// LookupVolume retrieves a volume by unambigious partial name.
+// LookupVolume retrieves a volume by unambiguous partial name.
 func (r *Runtime) LookupVolume(name string) (*Volume, error) {
 	r.lock.RLock()
 	defer r.lock.RUnlock()