Merge pull request #23384 from jannickfahlbusch/fix-typos

Fix some typos
This commit is contained in:
Vincent Demeester 2016-06-08 23:46:47 +02:00
commit 8a22c4166b
3 changed files with 4 additions and 4 deletions

View file

@ -164,7 +164,7 @@ func (cli *DockerCli) GetTtySize() (int, int) {
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 {
tmpFile, err := ioutil.TempFile(filepath.Dir(outfile), ".docker_temp_")
if err != nil {
@ -208,7 +208,7 @@ func (cli *DockerCli) RetrieveAuthConfigs() map[string]types.AuthConfig {
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
// api/client/container
func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal {

View file

@ -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 {
// The container is not ready yet. Remain in the starting state.
} else {
// Failure (incuding invalid exit code)
// Failure (including invalid exit code)
h.FailingStreak++
if c.State.Health.FailingStreak >= retries {
h.Status = types.Unhealthy

View file

@ -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
// happenned without a clean daemon shutdown
// happened without a clean daemon shutdown
func (clnt *client) cleanupOldRootfs(containerID string) {
// Unmount and delete the bundle folder
if mts, err := mount.GetMounts(); err == nil {