Skip to content

Commit

Permalink
Merge pull request containers#8316 from rhatdan/codespell
Browse files Browse the repository at this point in the history
Fix issues found with codespell
  • Loading branch information
openshift-merge-robot authored Nov 12, 2020
2 parents a65ecc7 + a743100 commit 2fc2d46
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-build.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions hack/get_ci_vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/toolbox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2fc2d46

Please sign in to comment.