summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/podman/common/create.go2
-rwxr-xr-xcontrib/dependabot-dance4
-rw-r--r--docs/source/markdown/podman-create.1.md2
-rw-r--r--docs/source/markdown/podman-run.1.md2
-rw-r--r--libpod/container_config.go2
-rw-r--r--libpod/define/container_inspect.go2
-rw-r--r--test/e2e/ps_test.go2
-rw-r--r--test/upgrade/README.md2
8 files changed, 9 insertions, 9 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index c3d00d293..64d1956eb 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -277,7 +277,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
createFlags.StringSliceVar(
&cf.GroupAdd,
groupAddFlagName, []string{},
- "Add additional groups to the primary container process. 'keep-groups' allows container processes to use suplementary groups.",
+ "Add additional groups to the primary container process. 'keep-groups' allows container processes to use supplementary groups.",
)
_ = cmd.RegisterFlagCompletionFunc(groupAddFlagName, completion.AutocompleteNone)
diff --git a/contrib/dependabot-dance b/contrib/dependabot-dance
index 3cf740753..8261dd143 100755
--- a/contrib/dependabot-dance
+++ b/contrib/dependabot-dance
@@ -55,8 +55,8 @@ function branch_dance() {
echo
echo "Commit author is '$author' (expected 'dependabot')"
echo -n "Continue? [y/N] "
- read ans
- case "$ans" in
+ read answer
+ case "$answer" in
[yY]*) ;;
*) exit 1;;
esac
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index 25b2fe11a..bd2aab4c2 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -952,7 +952,7 @@ The `container_manage_cgroup` boolean must be enabled for this to be allowed on
#### **\-\-timeout**=*seconds*
-Maximimum time a container is allowed to run before conmon sends it the kill
+Maximum time a container is allowed to run before conmon sends it the kill
signal. By default containers will run until they exit or are stopped by
`podman stop`.
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index 8689014c0..0c412c2a6 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -1025,7 +1025,7 @@ setsebool -P container_manage_cgroup true
#### **\-\-timeout**=*seconds*
-Maximimum time a container is allowed to run before conmon sends it the kill
+Maximum time a container is allowed to run before conmon sends it the kill
signal. By default containers will run until they exit or are stopped by
`podman stop`.
diff --git a/libpod/container_config.go b/libpod/container_config.go
index da732c05b..a508b96ee 100644
--- a/libpod/container_config.go
+++ b/libpod/container_config.go
@@ -301,7 +301,7 @@ type ContainerMiscConfig struct {
StopSignal uint `json:"stopSignal,omitempty"`
// StopTimeout is the signal that will be used to stop the container
StopTimeout uint `json:"stopTimeout,omitempty"`
- // Timeout is maximimum time a container will run before getting the kill signal
+ // Timeout is maximum time a container will run before getting the kill signal
Timeout uint `json:"timeout,omitempty"`
// Time container was created
CreatedTime time.Time `json:"createdTime"`
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go
index c236f35b0..5283946fa 100644
--- a/libpod/define/container_inspect.go
+++ b/libpod/define/container_inspect.go
@@ -66,7 +66,7 @@ type InspectContainerConfig struct {
Secrets []*InspectSecret `json:"Secrets,omitempty"`
// Timeout is time before container is killed by conmon
Timeout uint `json:"Timeout"`
- // StopTimeout is time before container is stoped when calling stop
+ // StopTimeout is time before container is stopped when calling stop
StopTimeout uint `json:"StopTimeout"`
}
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index d5269f415..2d7d84005 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -270,7 +270,7 @@ var _ = Describe("Podman ps", func() {
Expect(result.ExitCode()).To(Equal(0))
Expect(result.OutputToString()).To(Equal(cid))
- // Query by trunctated image name should not match ( should return empty output )
+ // Query by truncated image name should not match ( should return empty output )
result = podmanTest.Podman([]string{"ps", "-q", "--no-trunc", "-a", "--filter", "ancestor=quay.io/libpod/alpi"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
diff --git a/test/upgrade/README.md b/test/upgrade/README.md
index 2979a66d7..6e5005134 100644
--- a/test/upgrade/README.md
+++ b/test/upgrade/README.md
@@ -84,4 +84,4 @@ Where To Go From Here
* Figuring out how/if to run variations with different config files
(e.g. running OLD-PODMAN that creates a user libpod.conf, tweaking
- that in the test, then running NEW-PODMAN upgrate tests)
+ that in the test, then running NEW-PODMAN upgrade tests)