Merge pull request #8309 from ArikaChen/master

Fix typo:betweem->between and PtySlace->PtySlave

daemon/attach.go

@@ -114,7 +114,7 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) engine.Status {
 
 // FIXME: this should be private, and every outside subsystem
 // should go through the "container_attach" job. But that would require
-// that job to be properly documented, as well as the relationship betweem
+// that job to be properly documented, as well as the relationship between
 // Attach and ContainerAttach.
 //
 // This method is in use by builder/builder.go.

daemon/exec.go

@@ -243,7 +243,7 @@ func (container *Container) Exec(execConfig *execConfig) error {
 	callback := func(processConfig *execdriver.ProcessConfig, pid int) {
 		if processConfig.Tty {
 			// The callback is called after the process Start()
-			// so we are in the parent process. In TTY mode, stdin/out/err is the PtySlace
+			// so we are in the parent process. In TTY mode, stdin/out/err is the PtySlave
 			// which we close here.
 			if c, ok := processConfig.Stdout.(io.Closer); ok {
 				c.Close()

daemon/monitor.go

@@ -236,7 +236,7 @@ func (m *containerMonitor) shouldRestart(exitStatus int) bool {
 func (m *containerMonitor) callback(processConfig *execdriver.ProcessConfig, pid int) {
 	if processConfig.Tty {
 		// The callback is called after the process Start()
-		// so we are in the parent process. In TTY mode, stdin/out/err is the PtySlace
+		// so we are in the parent process. In TTY mode, stdin/out/err is the PtySlave
 		// which we close here.
 		if c, ok := processConfig.Stdout.(io.Closer); ok {
 			c.Close()