From 4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c Mon Sep 17 00:00:00 2001 From: Samanta Navarro Date: Wed, 11 Nov 2020 11:38:19 +0000 Subject: Fix typos. Typos found with codespell. Please keep in mind that this should have impact on actual code and must be carefully evaluated: src/core/or/lttng_circuit.inc - ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER) + ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER) --- scripts/ci/ci-driver.sh | 2 +- scripts/git/git-setup-dirs.sh | 2 +- scripts/git/pre-commit.git-hook | 2 +- scripts/maint/annotate_ifdef_directives.py | 2 +- scripts/maint/codetool.py | 2 +- scripts/maint/rename_c_identifier.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 67a95a1f61..c07d99188b 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -461,7 +461,7 @@ fi if [[ "${STEM}" = "yes" ]]; then start_section "Stem" if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then - # XXXX This shold probably be part some test-stem make target. + # XXXX This should probably be part of some test-stem make target. if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \ python3 "${STEM_PATH}/run_tests.py" \ --tor src/app/tor \ diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index 3cc184dafb..5a9ae41cbd 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -494,7 +494,7 @@ set_tor_github_pr_fetch_config fetch_remote "tor-github" # GitLab remote -printf "%s Seting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}" +printf "%s Setting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}" add_remote "tor-gitlab" "$GITLAB_PULL" set_remote_push "tor-gitlab" "$GITLAB_PUSH" # Add custom fetch for MRs diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 5533ed0cdd..75e5133a73 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -3,7 +3,7 @@ # To install this script, copy it to .git/hooks/pre-commit in local copy of # tor git repo and make sure it has permission to execute. # -# This is pre-commit git hook script that prevents commiting your changeset if +# This is pre-commit git hook script that prevents committing your changeset if # it fails our code formatting, changelog entry formatting, module include # rules, etc... diff --git a/scripts/maint/annotate_ifdef_directives.py b/scripts/maint/annotate_ifdef_directives.py index 9ca090d595..eeca0bbb17 100755 --- a/scripts/maint/annotate_ifdef_directives.py +++ b/scripts/maint/annotate_ifdef_directives.py @@ -70,7 +70,7 @@ LINE_OBVIOUSNESS_LIMIT = 4 # Maximum line width. This includes a terminating newline character. # # (This is the maximum before encoding, so that if the the operating system -# uses multiple characers to encode newline, that's still okay.) +# uses multiple characters to encode newline, that's still okay.) LINE_WIDTH=80 class Problem(Exception): diff --git a/scripts/maint/codetool.py b/scripts/maint/codetool.py index 725712c0cc..c6daf759f5 100755 --- a/scripts/maint/codetool.py +++ b/scripts/maint/codetool.py @@ -11,7 +11,7 @@ # """ - This program uses a set of plugable filters to inspect and transform + This program uses a set of pluggable filters to inspect and transform our C code. """ diff --git a/scripts/maint/rename_c_identifier.py b/scripts/maint/rename_c_identifier.py index 7794689303..8b286c1a28 100755 --- a/scripts/maint/rename_c_identifier.py +++ b/scripts/maint/rename_c_identifier.py @@ -153,7 +153,7 @@ This is an automated commit, generated by this command: if no_verify: msg += """ It was generated with --no-verify, so it probably breaks some commit hooks. -The commiter should be sure to fix them up in a subsequent commit. +The committer should be sure to fix them up in a subsequent commit. """ return msg -- cgit v1.2.3-54-g00ecf