summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-12 23:29:51 +0100
committerGitHub <noreply@github.com>2020-11-12 23:29:51 +0100
commit2fc2d4643ee699b8efc97f23850d5a37c4a85b89 (patch)
treea46a03036da7eb12776c18632024d8a6efc81456
parenta65ecc70c21eb5eef7d7a6b70cc1f90e577bb72e (diff)
parenta7431003b8d53b3cc012a74c4015beac624f40f1 (diff)
downloadpodman-2fc2d4643ee699b8efc97f23850d5a37c4a85b89.tar.gz
podman-2fc2d4643ee699b8efc97f23850d5a37c4a85b89.tar.bz2
podman-2fc2d4643ee699b8efc97f23850d5a37c4a85b89.zip
Merge pull request #8316 from rhatdan/codespell
Fix issues found with codespell
-rw-r--r--Makefile2
-rw-r--r--docs/Readme.md2
-rw-r--r--docs/source/markdown/podman-build.1.md2
-rwxr-xr-xhack/get_ci_vm.sh6
-rw-r--r--test/e2e/toolbox_test.go2
-rw-r--r--troubleshooting.md2
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 726020cba..e6cd68f23 100644
--- a/Makefile
+++ b/Makefile
@@ -409,7 +409,7 @@ swagger-check:
.PHONY: codespell
codespell:
- codespell -S bin,vendor,.git,go.sum,changelog.txt,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist -w
+ codespell -S bin,vendor,.git,go.sum,changelog.txt,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist -w
# When publishing releases include critical build-time details
.PHONY: release.txt
diff --git a/docs/Readme.md b/docs/Readme.md
index c517052b3..ae0067be6 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -51,4 +51,4 @@ If reloading the page, or clearing your local cache does not fix the problem, it
likely caused by broken metadata needed to protect clients from cross-site-scripting
style attacks. Please [notify a maintainer](https://github.com/containers/podman#communications)
so they may investigate how/why the `swagger.yaml` file's CORS-metadata is
-incorrect, or the file isn't accessable for some other reason.
+incorrect, or the file isn't accessible for some other reason.
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md
index f9568b5d3..4f11fe08e 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -721,7 +721,7 @@ container. When the mount propagation policy is set to `slave`, one way mount
propagation is enabled and any mounts completed on the host for that volume will
be visible only inside of the container. To control the mount propagation
property of volume use the `:[r]shared`, `:[r]slave` or `:[r]private`
-propagation flag. The propagation property canbe specified only for bind mounted
+propagation flag. The propagation property can be specified only for bind mounted
volumes and not for internal volumes or named volumes. For mount propagation to
work on the source mount point (mount point where source dir is mounted on) has
to have the right propagation properties. For shared volumes, the source mount
diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh
index f8c7e792e..0755470a2 100755
--- a/hack/get_ci_vm.sh
+++ b/hack/get_ci_vm.sh
@@ -7,7 +7,7 @@
# problems specifically related to Cirrus-CI automated testing. However,
# because it's only loosely coupled to the `.cirrus.yml` configuration, it must
# orchestrate VMs in GCP directly. This means users need to have
-# pre-authorization (access) to manipulate google-cloud resoures. Additionally,
+# pre-authorization (access) to manipulate google-cloud resources. Additionally,
# there are no guarantees it will remain in-sync with other automation-related
# scripts. Therefore it may not always function for everybody in every
# future scenario without updates/modifications/tweaks.
@@ -149,7 +149,7 @@ parse_args(){
VM_IMAGE_NAME="$1"
- # Word-splitting is desireable in this case
+ # Word-splitting is desirable in this case
# shellcheck disable=SC2207
ENVS=(
$(get_env_vars)
@@ -166,7 +166,7 @@ parse_args(){
}
# Returns true if user has run an 'init' and has a valid token for
-# the specific project-id and named-configuration argumens in $PGCLOUD.
+# the specific project-id and named-configuration arguments in $PGCLOUD.
function has_valid_credentials() {
if $PGCLOUD info |& grep -Eq 'Account:.*None'; then
return 1
diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go
index 822159fc2..a3ed66d15 100644
--- a/test/e2e/toolbox_test.go
+++ b/test/e2e/toolbox_test.go
@@ -285,7 +285,7 @@ var _ = Describe("Toolbox-specific testing", func() {
var gid string = "2000"
// The use of bad* in the name of variables does not imply the invocation
- // of useradd should fail The user is supposed to be created successfuly
+ // of useradd should fail The user is supposed to be created successfully
// but later his information (uid, home, shell,..) is changed via usermod.
useradd := fmt.Sprintf("useradd --home-dir %s --shell %s --uid %s %s",
badHomeDir, badShell, badUID, username)
diff --git a/troubleshooting.md b/troubleshooting.md
index 2e0abae21..604ca9b1d 100644
--- a/troubleshooting.md
+++ b/troubleshooting.md
@@ -669,7 +669,7 @@ Example output might be:
memory pids
-In the above example, `cpu` is not listed, which means the curent user does
+In the above example, `cpu` is not listed, which means the current user does
not have permission to set CPU limits.
If you want to enable CPU limit delegation for all users, you can create the