Skip to content

Commit

Permalink
merge branch 'pr-1945'
Browse files Browse the repository at this point in the history
  Fix some typos

LGTMs: @crosbymichael @cyphar
Closes #1945
  • Loading branch information
cyphar committed Dec 10, 2018
2 parents 859f745 + 769d6c4 commit f5b9991
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion libcontainer/cgroups/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ func WriteCgroupProc(dir string, pid int) error {
return fmt.Errorf("no such directory for %s", CgroupProcesses)
}

// Dont attach any pid to the cgroup if -1 is specified as a pid
// Don't attach any pid to the cgroup if -1 is specified as a pid
if pid != -1 {
if err := ioutil.WriteFile(filepath.Join(dir, CgroupProcesses), []byte(strconv.Itoa(pid)), 0700); err != nil {
return fmt.Errorf("failed to write %v to %v: %v", pid, CgroupProcesses, err)
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/intelrdt/intelrdt.go
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ func WriteIntelRdtTasks(dir string, pid int) error {
return fmt.Errorf("no such directory for %s", IntelRdtTasks)
}

// Dont attach any pid if -1 is specified as a pid
// Don't attach any pid if -1 is specified as a pid
if pid != -1 {
if err := ioutil.WriteFile(filepath.Join(dir, IntelRdtTasks), []byte(strconv.Itoa(pid)), 0700); err != nil {
return fmt.Errorf("failed to write %v to %v: %v", pid, IntelRdtTasks, err)
Expand Down
2 changes: 1 addition & 1 deletion man/runc-pause.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ paused.

# DESCRIPTION
The pause command suspends all processes in the instance of the container.
Use runc list to identiy instances of containers and their current status.
Use runc list to identify instances of containers and their current status.
2 changes: 1 addition & 1 deletion man/runc-resume.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resumed.

# DESCRIPTION
The resume command resumes all processes in the instance of the container.
Use runc list to identiy instances of containers and their current status.
Use runc list to identify instances of containers and their current status.
4 changes: 2 additions & 2 deletions pause.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Where "<container-id>" is the name for the instance of the container to be
paused. `,
Description: `The pause command suspends all processes in the instance of the container.
Use runc list to identiy instances of containers and their current status.`,
Use runc list to identify instances of containers and their current status.`,
Action: func(context *cli.Context) error {
if err := checkArgs(context, 1, exactArgs); err != nil {
return err
Expand Down Expand Up @@ -45,7 +45,7 @@ Where "<container-id>" is the name for the instance of the container to be
resumed.`,
Description: `The resume command resumes all processes in the instance of the container.
Use runc list to identiy instances of containers and their current status.`,
Use runc list to identify instances of containers and their current status.`,
Action: func(context *cli.Context) error {
if err := checkArgs(context, 1, exactArgs); err != nil {
return err
Expand Down

0 comments on commit f5b9991

Please sign in to comment.