Merge pull request #21302 from allencloud/fix-typos-in-several-files

fix typos in several files

api/server/router/container/inspect.go

@@ -7,7 +7,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// getContainersByName inspects containers configuration and serializes it as json.
+// getContainersByName inspects container's configuration and serializes it as json.
 func (s *containerRouter) getContainersByName(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 	displaySize := httputils.BoolValue(r, "size")
 

daemon/inspect.go

@@ -109,7 +109,7 @@ func (daemon *Daemon) getInspectData(container *container.Container, size bool)
 	}
 
 	// we need this trick to preserve empty log driver, so
-	// container will use daemon defaults even if daemon change them
+	// container will use daemon defaults even if daemon changes them
 	if hostConfig.LogConfig.Type == "" {
 		hostConfig.LogConfig.Type = daemon.defaultLogConfig.Type
 	}

daemon/kill.go

@@ -27,7 +27,7 @@ func isErrNoSuchProcess(err error) bool {
 	return ok
 }
 
-// ContainerKill send signal to the container
+// ContainerKill sends signal to the container
 // If no signal is given (sig 0), then Kill with SIGKILL and wait
 // for the container to exit.
 // If a signal is given, then just send it to the container and return.

daemon/list.go

@@ -241,7 +241,7 @@ func (daemon *Daemon) foldFilter(config *types.ContainerListOptions) (*listConte
 	}, nil
 }
 
-// includeContainerInList decides whether a containers should be include in the output or not based in the filter.
+// includeContainerInList decides whether a container should be included in the output or not based in the filter.
 // It also decides if the iteration should be stopped or not.
 func includeContainerInList(container *container.Container, ctx *listContext) iterationAction {
 	// Do not include container if it's in the list before the filter container.
@@ -366,7 +366,7 @@ func (daemon *Daemon) transformContainer(container *container.Container, ctx *li
 		ImageID: container.ImageID.String(),
 	}
 	if newC.Names == nil {
-		// Dead containers will often have no name, so make sure the response isn't  null
+		// Dead containers will often have no name, so make sure the response isn't null
 		newC.Names = []string{}
 	}