Merge pull request #2060 from allencloud/fix-typos

fix typos

cli/commands.go

@@ -35,7 +35,7 @@ var (
 		{
 			Name:      "join",
 			ShortName: "j",
-			Usage:     "join a docker cluster",
+			Usage:     "Join a docker cluster",
 			Flags:     []cli.Flag{flJoinAdvertise, flHeartBeat, flTTL, flJoinRandomDelay, flDiscoveryOpt},
 			Action:    join,
 		},

cli/flags.go

@@ -59,7 +59,7 @@ var (
 	flTTL = cli.StringFlag{
 		Name:  "ttl",
 		Value: "180s",
-		Usage: "sets the expiration of an ephemeral node",
+		Usage: "set the expiration of an ephemeral node",
 	}
 	flTimeout = cli.StringFlag{
 		Name:  "timeout",

cluster/cluster.go

@@ -71,7 +71,7 @@ type Cluster interface {
 	// `status` is the current status, like "", "in progress" or "loaded"
 	Load(imageReader io.Reader, callback func(what, status string, err error))
 
-	// Return some info about the cluster, like nb or containers / images
+	// Return some info about the cluster, like nb of containers / images
 	// It is pretty open, so the implementation decides what to return.
 	Info() [][2]string
 
@@ -91,12 +91,12 @@ type Cluster interface {
 	// Return a random engine
 	RANDOMENGINE() (*Engine, error)
 
-	// RenameContainer rename a container
+	// Rename a container
 	RenameContainer(container *Container, newName string) error
 
-	// BuildImage build an image
+	// Build an image
 	BuildImage(*types.ImageBuildOptions, io.Writer) error
 
-	// TagImage tag an image
+	// Tag an image
 	TagImage(IDOrName string, repo string, tag string, force bool) error
 }

cluster/mesos/cluster.go

@@ -605,7 +605,7 @@ func (c *Cluster) LaunchTask(t *task.Task) bool {
 		}
 	}
 
-	log.Debug("Cannot parse docker info from task status, please upgrade Mesos to the last version")
+	log.Debug("Cannot parse docker info from task status, please upgrade Mesos to the latest version")
 	// For mesos <= 0.22 we fallback to a full refresh + using labels
 	// TODO: once 0.23 or 0.24 is released, remove all this block of code as it
 	// doesn't scale very well.