Browse Source

Fix some typos

Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
Jannick Fahlbusch 9 years ago
parent
commit
e3490cdcc0
3 changed files with 4 additions and 4 deletions
  1. 2 2
      api/client/utils.go
  2. 1 1
      daemon/health.go
  3. 1 1
      libcontainerd/client_linux.go

+ 2 - 2
api/client/utils.go

@@ -164,7 +164,7 @@ func (cli *DockerCli) GetTtySize() (int, int) {
 	return int(ws.Height), int(ws.Width)
 	return int(ws.Height), int(ws.Width)
 }
 }
 
 
-// CopyToFile writes the content of the reader to the specifed file
+// CopyToFile writes the content of the reader to the specified file
 func CopyToFile(outfile string, r io.Reader) error {
 func CopyToFile(outfile string, r io.Reader) error {
 	tmpFile, err := ioutil.TempFile(filepath.Dir(outfile), ".docker_temp_")
 	tmpFile, err := ioutil.TempFile(filepath.Dir(outfile), ".docker_temp_")
 	if err != nil {
 	if err != nil {
@@ -208,7 +208,7 @@ func (cli *DockerCli) RetrieveAuthConfigs() map[string]types.AuthConfig {
 	return acs
 	return acs
 }
 }
 
 
-// ForwardAllSignals forwards signals to the contianer
+// ForwardAllSignals forwards signals to the container
 // TODO: this can be unexported again once all container commands are under
 // TODO: this can be unexported again once all container commands are under
 // api/client/container
 // api/client/container
 func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal {
 func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal {

+ 1 - 1
daemon/health.go

@@ -133,7 +133,7 @@ func handleProbeResult(d *Daemon, c *container.Container, result *types.Healthch
 	} else if result.ExitCode == exitStatusStarting && c.State.Health.Status == types.Starting {
 	} else if result.ExitCode == exitStatusStarting && c.State.Health.Status == types.Starting {
 		// The container is not ready yet. Remain in the starting state.
 		// The container is not ready yet. Remain in the starting state.
 	} else {
 	} else {
-		// Failure (incuding invalid exit code)
+		// Failure (including invalid exit code)
 		h.FailingStreak++
 		h.FailingStreak++
 		if c.State.Health.FailingStreak >= retries {
 		if c.State.Health.FailingStreak >= retries {
 			h.Status = types.Unhealthy
 			h.Status = types.Unhealthy

+ 1 - 1
libcontainerd/client_linux.go

@@ -264,7 +264,7 @@ func (clnt *client) Stats(containerID string) (*Stats, error) {
 }
 }
 
 
 // Take care of the old 1.11.0 behavior in case the version upgrade
 // Take care of the old 1.11.0 behavior in case the version upgrade
-// happenned without a clean daemon shutdown
+// happened without a clean daemon shutdown
 func (clnt *client) cleanupOldRootfs(containerID string) {
 func (clnt *client) cleanupOldRootfs(containerID string) {
 	// Unmount and delete the bundle folder
 	// Unmount and delete the bundle folder
 	if mts, err := mount.GetMounts(); err == nil {
 	if mts, err := mount.GetMounts(); err == nil {