6 files changed, 7 insertions, 7 deletions
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index 047220906..82a74e419 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -75,7 +75,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 	)
 
 	// NOTE: the "filters" parameter is extracted separately for backwards
-	// compat via `fitlerFromRequest()`.
+	// compat via `filterFromRequest()`.
 	query := struct {
 		Since  string `schema:"since"`
 		Until  string `schema:"until"`
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
index 4b3a390f1..5adbeb031 100644
--- a/pkg/api/handlers/compat/info.go
+++ b/pkg/api/handlers/compat/info.go
@@ -48,7 +48,7 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
 	stateInfo := getContainersState(runtime)
 	sysInfo := sysinfo.New(true)
 
-	// FIXME: Need to expose if runtime supports Checkpoint'ing
+	// FIXME: Need to expose if runtime supports Checkpointing
 	// liveRestoreEnabled := criu.CheckForCriu() && configInfo.RuntimeSupportsCheckpoint()
 
 	info := &handlers.Info{Info: docker.Info{
diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go
index f76e18ee3..f49f06b17 100644
--- a/pkg/api/handlers/compat/volumes.go
+++ b/pkg/api/handlers/compat/volumes.go
@@ -208,7 +208,7 @@ func RemoveVolume(w http.ResponseWriter, r *http.Request) {
 	 * using the volume at the same time".
 	 *
 	 * With this in mind, we only consider the `force` query parameter when we
-	 * hunt for specified volume by name, using it to seletively return a 204
+	 * hunt for specified volume by name, using it to selectively return a 204
 	 * or blow up depending on `force` being truthy or falsey/unset
 	 * respectively.
 	 */
@@ -231,7 +231,7 @@ func RemoveVolume(w http.ResponseWriter, r *http.Request) {
 			utils.VolumeNotFound(w, name, err)
 		} else {
 			// Volume does not exist and `force` is truthy - this emulates what
-			// Docker would do when told to `force` removal of a nonextant
+			// Docker would do when told to `force` removal of a nonexistent
 			// volume
 			utils.WriteResponse(w, http.StatusNoContent, nil)
 		}
diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go
index 9ff0ad0eb..b20d89cc2 100644
--- a/pkg/api/server/register_archive.go
+++ b/pkg/api/server/register_archive.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func (s *APIServer) registerAchiveHandlers(r *mux.Router) error {
+func (s *APIServer) registerArchiveHandlers(r *mux.Router) error {
 	// swagger:operation PUT /containers/{name}/archive compat putArchive
 	// ---
 	//  summary: Put files into a container
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index c2423218a..7e6de8783 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -666,7 +666,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
 	//  - in: query
 	//    name: destination
 	//    type: string
-	//    description: Allows for pushing the image to a different destintation than the image refers to.
+	//    description: Allows for pushing the image to a different destination than the image refers to.
 	//  - in: query
 	//    name: tlsVerify
 	//    description: Require TLS verification.
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 09b6079e4..046f6561c 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -108,7 +108,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 
 	for _, fn := range []func(*mux.Router) error{
 		server.registerAuthHandlers,
-		server.registerAchiveHandlers,
+		server.registerArchiveHandlers,
 		server.registerContainersHandlers,
 		server.registerDistributionHandlers,
 		server.registerEventsHandlers,