Merge pull request #115 from jsoref/spelling

Spelling
Upstream-commit: 4ffefe4a1f
Component: cli

components/cli/cli/command/container/hijack.go

@@ -163,7 +163,7 @@ func (h *hijackedIOStreamer) beginInputStream(restoreInput func()) (doneC <-chan
 			if err != nil {
 				// This error will also occur on the receive
 				// side (from stdout) where it will be
-				// propogated back to the caller.
+				// propagated back to the caller.
 				logrus.Debugf("Error sendStdin: %s", err)
 			}
 		}

components/cli/cli/command/container/start.go

@@ -146,12 +146,12 @@ func runStart(dockerCli *command.DockerCli, opts *startOptions) error {
 				fmt.Fprintln(dockerCli.Err(), "Error monitoring TTY size:", err)
 			}
 		}
-		if attchErr := <-cErr; attchErr != nil {
+		if attachErr := <-cErr; attachErr != nil {
 			if _, ok := err.(term.EscapeError); ok {
 				// The user entered the detach escape sequence.
 				return nil
 			}
-			return attchErr
+			return attachErr
 		}
 
 		if status := <-statusChan; status != 0 {

components/cli/cli/command/formatter/container_test.go

@@ -226,7 +226,7 @@ size: 0B
 			Context{Format: NewContainerFormat("{{.Image}}", false, true)},
 			"ubuntu\nubuntu\n",
 		},
-		// Special headers for customerized table format
+		// Special headers for customized table format
 		{
 			Context{Format: NewContainerFormat(`table {{truncate .ID 5}}\t{{json .Image}} {{.RunningFor}}/{{title .Status}}/{{pad .Ports 2 2}}.{{upper .Names}} {{lower .Status}}`, false, true)},
 			`CONTAINER ID        IMAGE CREATED/STATUS/  PORTS  .NAMES STATUS

components/cli/cli/command/service/helpers.go

@@ -11,7 +11,7 @@ import (
 )
 
 // waitOnService waits for the service to converge. It outputs a progress bar,
-// if appopriate based on the CLI flags.
+// if appropriate based on the CLI flags.
 func waitOnService(ctx context.Context, dockerCli *command.DockerCli, serviceID string, opts *serviceOptions) error {
 	errChan := make(chan error, 1)
 	pipeReader, pipeWriter := io.Pipe()

components/cli/cli/command/service/logs.go

@@ -237,7 +237,7 @@ type logWriter struct {
 func (lw *logWriter) Write(buf []byte) (int, error) {
 	// this works but ONLY because stdcopy calls write a whole line at a time.
 	// if this ends up horribly broken or panics, check to see if stdcopy has
-	// reneged on that asssumption. (@god forgive me)
+	// reneged on that assumption. (@god forgive me)
 	// also this only works because the logs format is, like, barely parsable.
 	// if something changes in the logs format, this is gonna break
 

components/cli/cli/command/service/progress/progress.go

@@ -233,7 +233,7 @@ func writeOverallProgress(progressOut progress.Output, numerator, denominator in
 type replicatedProgressUpdater struct {
 	progressOut progress.Output
 
-	// used for maping slots to a contiguous space
+	// used for mapping slots to a contiguous space
 	// this also causes progress bars to appear in order
 	slotMap map[int]int