diff --git a/build_tools/fish_xgettext.fish b/build_tools/fish_xgettext.fish
index 9a0e2b295..f772d0f75 100755
--- a/build_tools/fish_xgettext.fish
+++ b/build_tools/fish_xgettext.fish
@@ -37,7 +37,7 @@ for f in share/config.fish share/completions/*.fish share/functions/*.fish
     rm /tmp/fish/explicit/$f.tmp
 
     # Handle `complete` / `function` description messages. The `| fish` is subtle. It basically
-    # avoids the need to use `source` with a command substituion that could affect the current
+    # avoids the need to use `source` with a command substitution that could affect the current
     # shell.
     string replace --filter --regex $implicit_regex 'echo $1' <$f | fish >/tmp/fish/implicit/$f.tmp ^/dev/null
     while read description
diff --git a/build_tools/style.fish b/build_tools/style.fish
index e3da235ae..4075bc9ef 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -23,7 +23,7 @@ if test $all = yes
     set files (git status --porcelain --short --untracked-files=all | sed -e 's/^ *[^ ]* *//')
     if set -q files[1]
         echo
-        echo You have uncommited changes. Cowardly refusing to restyle the entire code base.
+        echo You have uncommitted changes. Cowardly refusing to restyle the entire code base.
         echo
         exit 1
     end
diff --git a/config_cmake.h.in b/config_cmake.h.in
index cbf047f1d..ea7e90820 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -142,7 +142,7 @@
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "fish"
 
-/* Define to 1 if tparm accepts a fixed amount of paramters. */
+/* Define to 1 if tparm accepts a fixed amount of parameters. */
 #cmakedefine TPARM_SOLARIS_KLUDGE 1
 
 /* Enable GNU extensions on systems that have them.  */
diff --git a/share/completions/VBoxHeadless.fish b/share/completions/VBoxHeadless.fish
index 4dbbce6cd..7f9011565 100644
--- a/share/completions/VBoxHeadless.fish
+++ b/share/completions/VBoxHeadless.fish
@@ -5,7 +5,7 @@ complete -c VBoxHeadless -l vrdeproperty -o vrdeproperty -s e -x -d "Set VRDE pr
 complete -c VBoxHeadless -l settingspw -x -d "Specify settings password"
 complete -c VBoxHeadless -l settingspwfile -f -d "Specify file containing setting password"
 complete -c VBoxHeadless -l start-paused -o start-paused -d "Start VM in paused state"
-complete -c VBoxHeadless -l capture -o capture -s c -x -d "Record VM screen ouput to file"
+complete -c VBoxHeadless -l capture -o capture -s c -x -d "Record VM screen output to file"
 complete -c VBoxHeadless -l width -s w -x -d "Frame width when recording"
 complete -c VBoxHeadless -l height -s h -x -d "Frame height when recording"
 complete -c VBoxHeadless -l bitrate -s r -x -d "Recording bit rate when recording"
diff --git a/share/completions/acpi.fish b/share/completions/acpi.fish
index bf822be6c..99c7619d0 100644
--- a/share/completions/acpi.fish
+++ b/share/completions/acpi.fish
@@ -14,7 +14,7 @@ complete -c acpi -s A -l without-ac-adapter -d 'Suppress ac-adapter information'
 complete -c acpi -s V -l everything -d 'Show every device, overrides above options'
 complete -c acpi -s s -l show-empty -d 'Show non-operational devices'
 complete -c acpi -s S -l hide-empty -d 'Hide non-operational devices'
-complete -c acpi -s c -l celcius -d 'Use celcius as the temperature unit'
+complete -c acpi -s c -l celcius -d 'Use celsius as the temperature unit'
 complete -c acpi -s f -l fahrenheit -d 'Use fahrenheit as the temperature unit'
 complete -c acpi -s k -l kelvin -d 'Use kelvin as the temperature unit'
 complete -c acpi -s d -l directory -d '<dir> path to ACPI info (/proc/acpi)'
diff --git a/share/completions/apt-extracttemplates.fish b/share/completions/apt-extracttemplates.fish
index 9ddf27596..1d1d049ee 100644
--- a/share/completions/apt-extracttemplates.fish
+++ b/share/completions/apt-extracttemplates.fish
@@ -2,6 +2,6 @@
 #apt-extracttemplates
 complete -c apt-extracttemplates -s h -l help -d "Display help and exit"
 complete -r -c apt-extracttemplates -s t -d "Set temp dir"
-complete -r -c apt-extracttemplates -s c -d "Specifiy config file"
+complete -r -c apt-extracttemplates -s c -d "Specify config file"
 complete -r -c apt-extracttemplates -s o -d "Specify options"
 
diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index 5c3451cd6..d61b304d7 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -47,7 +47,7 @@ complete -f -n '__fish_bundle_using_command install' -c bundle -l binstubs -d 'C
 complete -f -n '__fish_bundle_using_command install' -c bundle -l shebang -d 'Specify a ruby executable to use with generated binstubs'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l standalone -d 'Make a bundle that can work without RubyGems or Bundler at run-time'
 complete -f -n '__fish_bundle_using_command install' -c bundle -s P -l trust-policy -d 'Apply a RubyGems security policy: {High,Medium,Low,No}Security'
-complete -f -n '__fish_bundle_using_command install' -c bundle -s j -l jobs -d 'Install  gems parallely by starting size number of parallel workers'
+complete -f -n '__fish_bundle_using_command install' -c bundle -s j -l jobs -d 'Install gems parallelly by starting size number of parallel workers'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l no-cache -d 'Do not update the cache in vendor/cache with the newly bundled gems'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l quiet -d 'Do not print progress information to stdout'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l clean -d 'Run bundle clean automatically after install'
diff --git a/share/completions/bzip2.fish b/share/completions/bzip2.fish
index 4d9b589b4..01199d2b5 100644
--- a/share/completions/bzip2.fish
+++ b/share/completions/bzip2.fish
@@ -16,7 +16,7 @@ complete -c bzip2 -s t -l test -d "Check integrity"
 complete -c bzip2 -s f -l force -d "Overwrite"
 complete -c bzip2 -s k -l keep -d "Do not overwrite"
 complete -c bzip2 -s s -l small -d "Reduce memory usage"
-complete -c bzip2 -s q -l quiet -d "Supress errors"
+complete -c bzip2 -s q -l quiet -d "Suppress errors"
 complete -c bzip2 -s v -l verbose -d "Print compression ratios"
 complete -c bzip2 -s L -l license -d "Print license"
 complete -c bzip2 -s V -l version -d "Display version and exit"
diff --git a/share/completions/cowsay.fish b/share/completions/cowsay.fish
index 7f49c70aa..89b41dbd2 100644
--- a/share/completions/cowsay.fish
+++ b/share/completions/cowsay.fish
@@ -5,7 +5,7 @@ complete -c cowsay -s f -d "Specify cow file" -x -a '(cowsay -l|tail -n +2|tr \
 complete -c cowsay -s h -d "Display help and exit"
 complete -c cowsay -s l -d "List all cowfiles"
 complete -c cowsay -s n -d "No word wrapping"
-complete -c cowsay -s T -d "Specify tounge string"
+complete -c cowsay -s T -d "Specify tongue string"
 complete -c cowsay -s W -d "Column width" -r
 complete -c cowsay -s b -d "Borg cow"
 complete -c cowsay -s d -d "Dead cow"
diff --git a/share/completions/cowthink.fish b/share/completions/cowthink.fish
index f45b7b132..e99be1829 100644
--- a/share/completions/cowthink.fish
+++ b/share/completions/cowthink.fish
@@ -5,7 +5,7 @@ complete -c cowthink -s f -d "Specify cow file" -x -a '(cowthink -l|tail -n +2|t
 complete -c cowthink -s h -d "Display help and exit"
 complete -c cowthink -s l -d "List all cowfiles"
 complete -c cowthink -s n -d "No word wrapping"
-complete -c cowthink -s T -d "Specify tounge string"
+complete -c cowthink -s T -d "Specify tongue string"
 complete -c cowthink -s W -d "Column width" -r
 complete -c cowthink -s b -d "Borg cow"
 complete -c cowthink -s d -d "Dead cow"
diff --git a/share/completions/dhcpcd.fish b/share/completions/dhcpcd.fish
index 5d34fc275..8c9d7747c 100644
--- a/share/completions/dhcpcd.fish
+++ b/share/completions/dhcpcd.fish
@@ -18,7 +18,7 @@ complete -c dhcpcd -l logfile -s j -r -d 'Writes to specfied log file instead of
 complete -c dhcpcd -l release -s k -x -d 'Release lease and de-configure interface' -a '(__fish_print_interfaces)'
 complete -c dhcpcd -l leasetime -s l -x -d 'Request specific lease time in secs'
 complete -c dhcpcd -l master -s M -d 'Start dhcpcd in Master mode'
-complete -c dhcpcd -l metric -s m -x -d 'Set prefered interface based on given rank (lowest wins)'
+complete -c dhcpcd -l metric -s m -x -d 'Set preferred interface based on given rank (lowest wins)'
 complete -c dhcpcd -l rebind -s n -x -d 'Reload config and rebind specified interface' -a '(__fish_print_interfaces)'
 complete -c dhcpcd -l renew -s N -x -d 'Renew existing addresses on specified interface' -a '(__fish_print_interfaces)'
 complete -c dhcpcd -l option -s o -x -d 'Request DHCP option'
diff --git a/share/completions/epkginfo.fish b/share/completions/epkginfo.fish
index dfa0b596f..d885243c9 100644
--- a/share/completions/epkginfo.fish
+++ b/share/completions/epkginfo.fish
@@ -4,7 +4,7 @@ complete -c epkginfo -s h -l help -d "display help"
 complete -c epkginfo -s d -l description -d "extended pkg description"
 complete -c epkginfo -s H -l herd -d "herd(s) for the pkg"
 complete -c epkginfo -s k -l keywords -d "keywords for all matching pkg versions"
-complete -c epkginfo -s l -l license -d "licenses for the best maching version"
+complete -c epkginfo -s l -l license -d "licenses for the best matching version"
 complete -c epkginfo -s m -l maintainer -d "maintainer(s) for the pkg"
 complete -c epkginfo -s S -l stablreq -d "STABLEREQ arches (cc's) for all matching pkg versio"
 complete -c epkginfo -s u -l useflags -d "per-pkg USE flag descriptions"
diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index 4c2878c36..8ae7eec76 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -114,7 +114,7 @@ complete -c equery -n '__fish_seen_subcommand_from l list; and     __fish_contai
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description -d "Show extended pkg description"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd -d "Show pkg's herd(s)"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords -d "Show keywords for all matching pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license -d "Show licenses for the best maching version"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license -d "Show licenses for the best matching version"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s m -l maintainer -d "Show the maintainer(s) for the pkg"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s S -l stablreq -d "Show STABLEREQ arches (cc's) for all matching pkg versions"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s u -l useflags -d "Show per-pkg USE flag descriptions"
diff --git a/share/completions/feh.fish b/share/completions/feh.fish
index 26e32cf65..70a95c399 100644
--- a/share/completions/feh.fish
+++ b/share/completions/feh.fish
@@ -45,7 +45,7 @@ complete -c feh -l output-dir -s j -r -d "Save files to given directory"
 complete -c feh -l preload -s p -d "Preload images"
 complete -c feh -l quiet -s q -d "Don't report non-fatal errors"
 complete -c feh -l randomize -s z -d "Randomize file list before displaying"
-complete -c feh -l recursive -s r -d "Recursivly expand any directory"
+complete -c feh -l recursive -s r -d "Recursively expand any directory"
 complete -c feh -l no-recursive -d "Don't recursively expand any directory (default)"
 complete -c feh -l reload -s R -x -d "Reload filelist after given time in second"
 complete -c feh -l reverse -s n -d "Reverse sort order"
diff --git a/share/completions/find.fish b/share/completions/find.fish
index ecc3d15ed..fab40bc62 100644
--- a/share/completions/find.fish
+++ b/share/completions/find.fish
@@ -47,7 +47,7 @@ complete -c find -o ilname -d "File is symlink matching specified case insensiti
 complete -c find -o iname -d "File name matches case insensitive pattern" -r
 complete -c find -o inum -d "File has specified inode number" -r
 complete -c find -o ipath -o iwholename -d "File path matches case insensitive pattern" -r
-complete -c find -o iregex -d "File name matches case insensetive regex" -r
+complete -c find -o iregex -d "File name matches case insensitive regex" -r
 
 complete -c find -o links -d "File has specified number of links" -r -a "1 2 3 4 5 6 7 8 9"
 complete -c find -o lname -d "File is symlink matching specified pattern" -r
diff --git a/share/completions/fossil.fish b/share/completions/fossil.fish
index 6b07c7a24..b5ce82140 100644
--- a/share/completions/fossil.fish
+++ b/share/completions/fossil.fish
@@ -222,7 +222,7 @@ complete -c fossil -n '__fish_fossil_command finfo' -s s -l status -d 'Select st
 complete -c fossil -n __fish_fossil_needs_command -f -a help -d 'Display help'
 complete -c fossil -n '__fish_fossil_command help' -s a -l all -d 'Show main and auxiliary commands'
 complete -c fossil -n '__fish_fossil_command help' -s t -l test -d 'Show test commands only'
-complete -c fossil -n '__fish_fossil_command help' -s x -l aux -d 'Show auxilary commands only'
+complete -c fossil -n '__fish_fossil_command help' -s x -l aux -d 'Show auxiliary commands only'
 complete -c fossil -n '__fish_fossil_command help' -s w -l www -d 'Show list of web UI pages'
 
 # import
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 683b781d0..c7835acc3 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1122,7 +1122,7 @@ complete -c git -n '__fish_git_using_command log' -l merges -d 'Print only merge
 complete -c git -n '__fish_git_using_command log' -l no-merges -d 'Don\'t print commits with more than one parent'
 complete -x -c git -n '__fish_git_using_command log' -l min-parents -d 'Show only commit with at least the given number of parents'
 complete -x -c git -n '__fish_git_using_command log' -l max-parents -d 'Show only commit with at most the given number of parents'
-complete -c git -n '__fish_git_using_command log' -l no-min-parents -d 'Show only commit without a mimimum number of parents'
+complete -c git -n '__fish_git_using_command log' -l no-min-parents -d 'Show only commit without a minimum number of parents'
 complete -c git -n '__fish_git_using_command log' -l no-max-parents -d 'Show only commit without a maximum number of parents'
 complete -c git -n '__fish_git_using_command log' -l first-parent -d 'Follow only the first parent commit upon seeing a merge commit'
 complete -c git -n '__fish_git_using_command log' -l not -d 'Reverse meaning of ^ prefix'
@@ -1571,7 +1571,7 @@ complete -f -c git -n '__fish_git_using_command tag' -s a -l annotate -d 'Make a
 complete -f -c git -n '__fish_git_using_command tag' -s s -l sign -d 'Make a GPG-signed tag'
 complete -f -c git -n '__fish_git_using_command tag' -s d -l delete -d 'Remove a tag'
 complete -f -c git -n '__fish_git_using_command tag' -s v -l verify -d 'Verify signature of a tag'
-complete -f -c git -n '__fish_git_using_command tag' -s f -l force -d 'Force overwriting exising tag'
+complete -f -c git -n '__fish_git_using_command tag' -s f -l force -d 'Force overwriting existing tag'
 complete -f -c git -n '__fish_git_using_command tag' -s l -l list -d 'List tags'
 complete -f -c git -n '__fish_git_using_command tag' -l contains -xka '(__fish_git_commits)' -d 'List tags that contain a commit'
 complete -f -c git -n '__fish_git_using_command tag; and __fish_contains_opt -s d delete -s v verify' -a '(__fish_git_tags)' -d 'Tag'
diff --git a/share/completions/gprof.fish b/share/completions/gprof.fish
index b95fa1d51..8ec61757f 100644
--- a/share/completions/gprof.fish
+++ b/share/completions/gprof.fish
@@ -18,12 +18,12 @@ complete -xc gprof -s w -l width -d "Set width of output"
 complete -c gprof -s x -l all-lines -d "Annotate every line"
 complete -xc gprof -l demangle -d "Set demangling style"
 complete -c gprof -l no-demangle -d "Turn of demangling"
-complete -xc gprof -s a -l no-static -d "Supress static functions"
+complete -xc gprof -s a -l no-static -d "Suppress static functions"
 complete -xc gprof -s c -l static-call-graph
 complete -xc gprof -s D -l ignore-non-functions -d "Ignore symbols not known to be functions"
 complete -xc gprof -s k -r -d "Delete arcs from callgraph"
 complete -xc gprof -s l -l line -d "Line by line profiling"
-complete -xc gprof -s m -l min-count -r -d "Supress output when executed less than specified times"
+complete -xc gprof -s m -l min-count -r -d "Suppress output when executed less than specified times"
 complete -xc gprof -s n -l time -d "Only propagate times for matching symbols"
 complete -xc gprof -s N -l no-time -d "Do not propagate times for matching symbols"
 complete -xc gprof -s z -l display-unused-functions -d "Mention unused functions in flat profile"
diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index 05e70fb84..97a7e4756 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -5,7 +5,7 @@ complete -c gradle -l help -s h -d 'Show help'
 complete -c gradle -l no-rebuild -s a -d 'Don\'t rebuild dependencies'
 complete -c gradle -l build-file -s b -r -d 'Specify build file'
 complete -c gradle -l settings-file -s c -r -d 'Specify settings file'
-complete -c gradle -l configure-on-demand -d 'Only relevent project are configured'
+complete -c gradle -l configure-on-demand -d 'Only relevant project are configured'
 complete -c gradle -l console -x -d 'Specify console output type' -a 'plan auto rich'
 complete -c gradle -l continue -d 'Continue task execution after failure'
 complete -c gradle -l system-prop -s D -r -d 'Set system property of the JVM'
diff --git a/share/completions/ip.fish b/share/completions/ip.fish
index 05e3de3d4..219f1966a 100644
--- a/share/completions/ip.fish
+++ b/share/completions/ip.fish
@@ -248,7 +248,7 @@ function __fish_complete_ip
                                         # Lifetime
                                     case '*'
                                         printf '%s\t%s\n' forever "Keep address valid forever" \
-                                            home "(Ipv6 only) Designate address as home adress" \
+                                            home "(Ipv6 only) Designate address as home address" \
                                             nodad "(Ipv6 only) Don't perform duplicate address detection" \
                                             dev "Add address to specified device" \
                                             scope "Set scope of address" \
diff --git a/share/completions/iw.fish b/share/completions/iw.fish
index 00a7172ed..1a8f0e6c9 100644
--- a/share/completions/iw.fish
+++ b/share/completions/iw.fish
@@ -253,7 +253,7 @@ function __fish_complete_iw
                     printf '%s\t%s\n' coalesce "Interface with coalesce" \
                         hwsim "" \
                         info "Show wireless device capabilities" \
-                        interface "Add a new virutal interface" \
+                        interface "Add a new virtual interface" \
                         channels "Show available channels" \
                         reg "Manage regulatory domains" \
                         set "Set parameters" \
diff --git a/share/completions/jq.fish b/share/completions/jq.fish
index 6cc8e609d..30ec151a3 100644
--- a/share/completions/jq.fish
+++ b/share/completions/jq.fish
@@ -15,8 +15,8 @@ complete -c jq -l monochrome-output -s M -d 'Don\'t color output'
 complete -c jq -l ascii-output -s a -d 'Replace UTF-8 characters with escape sequences'
 complete -c jq -l unbuffered -d 'Flush output after each JSON object is printed'
 complete -c jq -l sort-keys -s S -d 'Sort object keys in output'
-complete -c jq -l raw-output -s r -d 'If output is string ouput its content directly to stdout'
-complete -c jq -l join-output -s j -d 'Raw ouput without newlines'
+complete -c jq -l raw-output -s r -d 'If output is string output its content directly to stdout'
+complete -c jq -l join-output -s j -d 'Raw output without newlines'
 complete -c jq -l from-file -s f -r -d 'Read filter from file'
 complete -c jq -s L -d 'Prepend given directory to search modules'
 complete -c jq -l exit-status -s e -x -d 'Set exit status'
diff --git a/share/completions/less.fish b/share/completions/less.fish
index a9232dd33..626f098e1 100644
--- a/share/completions/less.fish
+++ b/share/completions/less.fish
@@ -4,7 +4,7 @@ complete -c less -s b -l buffers -r -d "Buffer space"
 complete -c less -s B -l auto-buffers -d "Disable automtic buffer allocation"
 complete -c less -s c -l clear-screen -d "Repaint from top"
 complete -c less -s C -l CLEAR-SCREEN -d "Clear and repaint from top"
-complete -c less -s d -l dumb -d "Supress error for lacking terminal capability"
+complete -c less -s d -l dumb -d "Suppress error for lacking terminal capability"
 complete -c less -s e -l quit-at-eof -d "Exit on second EOF"
 complete -c less -s E -l QUIT-AT-EOF -d "Exit on EOF"
 complete -c less -s f -l force -d "Open non-regular files"
diff --git a/share/completions/logkeys.fish b/share/completions/logkeys.fish
index 62ce14944..2e6b381a9 100644
--- a/share/completions/logkeys.fish
+++ b/share/completions/logkeys.fish
@@ -1,7 +1,7 @@
 
 complete -c logkeys -s s -l start -d 'Starts the keylogging daemon'
 complete -c logkeys -s k -l kill -d 'Terminates the logkeys daemon'
-complete -c logkeys -s o -l output -d 'Set ouput LOGFILE'
+complete -c logkeys -s o -l output -d 'Set output LOGFILE'
 complete -c logkeys -s m -l keymap -n '__fish_not_contain_opt -s u' -d 'Use file as input KEYMAP'
 complete -c logkeys -s d -l device -d 'Use DEVICE as keyboard input'
 complete -c logkeys -s u -l us-keymap -n '__fish_not_contain_opt -s m' -d 'Treat keyboard as standard US keyboard'
diff --git a/share/completions/lsblk.fish b/share/completions/lsblk.fish
index 359d2d328..e287871a9 100644
--- a/share/completions/lsblk.fish
+++ b/share/completions/lsblk.fish
@@ -12,5 +12,5 @@ complete -c lsblk -s o -l output -d "output columns" -xa '( __fish_complete_list
 complete -c lsblk -s P -l pairs -d "use key='value' output format"
 complete -c lsblk -s r -l raw -d "use raw output format"
 complete -c lsblk -s t -l topology -d "output info about topology"
-complete -c lsblk -s l -l list -d "use list format ouput"
+complete -c lsblk -s l -l list -d "use list format output"
 
diff --git a/share/completions/mkdocs.fish b/share/completions/mkdocs.fish
index 182330cda..90782f881 100644
--- a/share/completions/mkdocs.fish
+++ b/share/completions/mkdocs.fish
@@ -18,7 +18,7 @@ complete -n 'contains build (commandline -poc)' -c mkdocs -s d -l site-dir -r -d
 complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a 'gh-deploy' -d 'Deploy your documentation to GitHub Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s c -l clean -d 'Remove old site_dir before building (the default)'
 complete -n 'contains gh-deploy (commandline -poc)' -c mkdocs -s f -l config-file -r -d 'Provide a specific MkDocs config'
-complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s m -l message -r -d 'A commit message to use when commiting to the Github Pages remote branch'
+complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s m -l message -r -d 'A commit message to use when committing to the Github Pages remote branch'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s b -l remote-branch -r -d 'The remote branch to commit to for Github Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s r -l remote-name -r -d 'The remote name to commit to for Github Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -l force -d 'Force the push to the repository'
diff --git a/share/completions/mvn.fish b/share/completions/mvn.fish
index 153884f22..18a243477 100644
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@@ -110,7 +110,7 @@ complete -c mvn -a "resources:copy-resources" -d "Copy resources of the configur
 complete -c mvn -a "resources:help" -d "Display help information on maven-resources-plugin. Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details."
 complete -c mvn -a "resources:resources" -d "Copy resources for the main source code to the main output directory. Always uses the project.build.resources element to specify the resources to copy."
 complete -c mvn -a "site:attach-descriptor" -d "Adds the site descriptor (site.xml) to the list of files to be installed/deployed. For Maven-2.x this is enabled by default only when the project has pom packaging since it will be used by modules inheriting, but this can be enabled for other projects packaging if needed. This default execution has been removed from the built-in lifecycle of Maven 3.x for pom-projects. Users that actually use those projects to provide a common site descriptor for sub modules will need to explicitly define this goal execution to restore the intended behavior."
-complete -c mvn -a "site:deploy" -d "Deploys the generated site using wagon supported protocols to the site URL specified in the <distributionManagement> section of the POM. For scp protocol, the website files are packaged by wagon into zip archive, then the archive is transfered to the remote host, next it is un-archived which is much faster than making a file by file copy. "
+complete -c mvn -a "site:deploy" -d "Deploys the generated site using wagon supported protocols to the site URL specified in the <distributionManagement> section of the POM. For scp protocol, the website files are packaged by wagon into zip archive, then the archive is transferred to the remote host, next it is un-archived which is much faster than making a file by file copy. "
 complete -c mvn -a "site:effective-site" -d "Displays the effective site descriptor as an XML for this build, after inheritance and interpolation of site.xml."
 complete -c mvn -a "site:help" -d "Display help information on maven-site-plugin. Call mvn site:help -Ddetail=true -Dgoal=<goal-name> to display parameter details."
 complete -c mvn -a "site:jar" -d "Bundles the site output into a JAR so that it can be deployed to a repository."
@@ -522,7 +522,7 @@ complete -c mvn -a "fitnesse:help" -d "Display help information on fitnesse-mave
 complete -c mvn -a "fitnesse:run" -d "This goal uses the fitnesse.runner.TestRunner class for calling a remote FitNesse web page and executes the tests or suites locally into a forked JVM. It's possible to define several pages and/or servers."
 complete -c mvn -a "fitnesse:fitnesse" -d "Generates a FitNesse report from a FitNesse web server. The generated report is an external report generated FitNesse itself. If the project use Clover for code coverage and if FitNesse has clover dependency (ie use the ArtifactId-Version-clover.jar), the code executed during the FitNesse execution (phase integration-test) will be had to the unit-test code coverage. See the clover example."
 complete -c mvn -a "selenium:start-server" -d "Start the Selenium server."
-complete -c mvn -a "selenium:xvfb" -d "Starts an Xvfb instance suitable for handling X11 displays for headless systems. Use this in combonation with the start-server goal to allow browsers to be launched on headless unix systems. Optionally uses 'xauth' to setup authentication for the Xvfb instance to allow running tests using the frame buffer server when another X server is already running. "
+complete -c mvn -a "selenium:xvfb" -d "Starts an Xvfb instance suitable for handling X11 displays for headless systems. Use this in combination with the start-server goal to allow browsers to be launched on headless unix systems. Optionally uses 'xauth' to setup authentication for the Xvfb instance to allow running tests using the frame buffer server when another X server is already running. "
 complete -c mvn -a "selenium:stop-server" -d "Stop the Selenium server."
 complete -c mvn -a "selenium:selenese" -d "Run a suite of HTML Selenese tests."
 complete -c mvn -a "selenium:help" -d "Display help information on selenium-maven-plugin. Call   mvn selenium:help -Ddetail=true -Dgoal=<goal-name> to display parameter details."
@@ -732,7 +732,7 @@ complete -c mvn -a "android:connect" -d "Connect external IP addresses to the AD
 complete -c mvn -a "android:deploy" -d "Deploys the apk(s) of the current project(s) to all attached devices and emulators. Automatically skips other projects in a multi-module build that do not use packaging apk without terminating. Deploymnet is automatically performed when running mvn integration-test (or mvn install) on a project with instrumentation tests."
 complete -c mvn -a "android:deploy-apk" -d "Deploys a specified Android application apk to attached devices and emulators. By default it will deploy to all, but a subset or single one can be configured with the device and devices parameters.This goal can be used in non-android projects and as standalone execution on the command line. "
 complete -c mvn -a "android:deploy-dependencies" -d "Deploys all directly declared dependencies of <type>apk</type> in this project's pom. Usually used in a project with instrumentation tests, to deploy the apk to test onto the device before running the deploying and running the instrumentation tests apk. Automatically performed when running mvn integration-test (or mvn install) on a project with instrumentation tests."
-complete -c mvn -a "android:devices" -d "DevicesMojo lists all attached devices and emulators found with the android debug bridge. It uses the same naming convention for the emulator as used in other places in the Android Maven Plugin and adds the status of the device in the list. TODO The goal is very simple and could be enhanced for better display, a verbose option to display and to take the android.device paramter into account."
+complete -c mvn -a "android:devices" -d "DevicesMojo lists all attached devices and emulators found with the android debug bridge. It uses the same naming convention for the emulator as used in other places in the Android Maven Plugin and adds the status of the device in the list. TODO The goal is very simple and could be enhanced for better display, a verbose option to display and to take the android.device parameter into account."
 complete -c mvn -a "android:dex" -d "Converts compiled Java classes to the Android dex format."
 complete -c mvn -a "android:disconnect" -d "Disconnect external IP addresses from the ADB server."
 complete -c mvn -a "android:emma" -d "After compiled Java classes use emma tool"
diff --git a/share/completions/pkg_delete.fish b/share/completions/pkg_delete.fish
index faf2f6543..772e7fac7 100644
--- a/share/completions/pkg_delete.fish
+++ b/share/completions/pkg_delete.fish
@@ -3,6 +3,6 @@
 
 complete -c pkg_delete -a '(__fish_print_packages)' --description 'Package'
 
-complete -c pkg_delete -o a -d 'Delete unsed deps'
+complete -c pkg_delete -o a -d 'Delete unused deps'
 complete -c pkg_delete -o V -d 'Turn on stats'
 
diff --git a/share/completions/quilt.fish b/share/completions/quilt.fish
index 7607d0da6..b9fc6823e 100644
--- a/share/completions/quilt.fish
+++ b/share/completions/quilt.fish
@@ -1,4 +1,4 @@
-# completions for quilt version 0.46 or similiar
+# completions for quilt version 0.46 or similar
 complete -c quilt -s h -d "show help"
 complete -c quilt -l version -d "show version"
 complete -c quilt -l quiltrc -r --no-file -d "specify the file to Run Control file to use"
diff --git a/share/completions/s3cmd.fish b/share/completions/s3cmd.fish
index 545576e0e..9e5bcba23 100644
--- a/share/completions/s3cmd.fish
+++ b/share/completions/s3cmd.fish
@@ -12,7 +12,7 @@ end
 complete -c s3cmd -f -n "__s3cmd_is_valid_remote_path" -a "(s3cmd ls (commandline -ct) 2>/dev/null | string match -r -- 's3://.*')"
 complete -c s3cmd -f -n "__s3cmd_is_remote_path"
 
-# Supress file completions for initial command
+# Suppress file completions for initial command
 complete -c s3cmd -n "__fish_is_first_token" -f
 
 # Available commands
diff --git a/share/completions/sfdx.fish b/share/completions/sfdx.fish
index 7ce1bc030..84f274a78 100644
--- a/share/completions/sfdx.fish
+++ b/share/completions/sfdx.fish
@@ -286,7 +286,7 @@ complete $sfdx_looking -xa force:data:tree -d 'manipulate records using the tree
 
 complete $sfdx_looking -xa force:data:tree:export -d 'export data from an org into sObject tree format for force:data:tree:import consumption'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir      -d 'directory to store files'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate mulitple sobject tree files and a plan definition file for aggregated import'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate multiple sobject tree files and a plan definition file for aggregated import'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query          -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix         -d 'prefix of generated files'
diff --git a/share/completions/stat.fish b/share/completions/stat.fish
index 804e72032..88ba989ba 100644
--- a/share/completions/stat.fish
+++ b/share/completions/stat.fish
@@ -12,7 +12,7 @@ else # OS X
     complete -c stat -s L -d "Use stat(2) instead of lsstat(2)"
     complete -c stat -s l -d "Display output in ls -lT format"
     complete -c stat -s n -d "Don't force a newline to appear at end of each piece of output"
-    complete -c stat -s q -d "Supress failure messages"
+    complete -c stat -s q -d "Suppress failure messages"
     complete -c stat -s r -d "Display raw information"
     complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
     complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
diff --git a/share/completions/uniq.fish b/share/completions/uniq.fish
index 6d966ffb4..7693c9517 100644
--- a/share/completions/uniq.fish
+++ b/share/completions/uniq.fish
@@ -1,5 +1,5 @@
 if uniq --version >/dev/null 2>/dev/null
-    complete -c uniq -s c -l count -d "Print number of occurences"
+    complete -c uniq -s c -l count -d "Print number of occurrences"
     complete -c uniq -s d -l repeated -d "Only print duplicates"
     complete -c uniq -s D -l all-repeated -d "Remove non-duplicate lines" -f -x -a "
 		none\t'Remove none-duplicate lines'
diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index 6e73f254a..591fc64e8 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -42,7 +42,7 @@ complete -c valgrind -l demangle -xd "Demangle C++ names" -a "yes no"
 complete -xc valgrind -l num-callers -d "Callers in stack trace"
 complete -xc valgrind -l error-limit -d "Stop showing errors if too many" -a "yes no"
 complete -xc valgrind -l show-below-main -d "Continue trace below main()" -a "yes no"
-complete -rc valgrind -l suppressions -d "Supress errors from file"
+complete -rc valgrind -l suppressions -d "Suppress errors from file"
 complete -c valgrind -l gen-suppressions -d "Print suppressions for detected errors"
 complete -xc valgrind -l db-attach -d "Start debugger on error" -a "yes no"
 complete -rc valgrind -l db-command -d "Debugger command"
diff --git a/share/completions/vim.fish b/share/completions/vim.fish
index c44fef446..083c2f811 100644
--- a/share/completions/vim.fish
+++ b/share/completions/vim.fish
@@ -3,7 +3,7 @@
 
 # todo
 # +[num]        : Position the cursor on line number
-# +/{pat}       : Position the cursor on the first occurence of {pat}
+# +/{pat}       : Position the cursor on the first occurrence of {pat}
 # +{command}    : Execute Ex command after the first file has been read
 complete -c vim -s c -r -d 'Execute Ex command after the first file has been read'
 complete -c vim -s S -r -d 'Source file after the first file has been read'
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 119294cfc..5c3a05ad6 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -158,7 +158,7 @@ function __fish_zpool_list_rw_properties
     echo -e "bootfs\t"(_ "Default bootable dataset")" (POOL/DATASET)"
     echo -e "cachefile\t"(_ "Pool configuration cache")" (PATH, none, '')"
     echo -e "comment\t"(_ "Comment about the pool")" (COMMENT)"
-    echo -e "dedupditto\t"(_ "Threshold for writting a ditto copy of deduplicated blocks")" (COUNT)"
+    echo -e "dedupditto\t"(_ "Threshold for writing a ditto copy of deduplicated blocks")" (COUNT)"
     echo -e "delegation\t"(_ "Allow rights delegation on the pool")" (on, off)"
     echo -e "failmode\t"(_ "Behavior in case of catastrophic pool failure")" (wait, continue, panic)"
     echo -e "listsnaps\t"(_ "Display snapshots even if 'zfs list' does not use '-t'")" (on, off)"
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 5584231e7..8df9d1518 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -336,7 +336,7 @@ int builtin_false(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 // NOTE: These must be kept in sorted order!
 static const builtin_data_t builtin_datas[] = {
     {L"[", &builtin_test, N_(L"Test a condition")},
-    {L"and", &builtin_generic, N_(L"Execute command if previous command suceeded")},
+    {L"and", &builtin_generic, N_(L"Execute command if previous command succeeded")},
     {L"argparse", &builtin_argparse, N_(L"Parse options in fish script")},
     {L"begin", &builtin_generic, N_(L"Create a block of code")},
     {L"bg", &builtin_bg, N_(L"Send job to background")},
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index dccdc5226..e61250eff 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -210,7 +210,7 @@ void builtin_printf_state_t::nonfatal_error(const wchar_t *fmt, ...) {
     streams.err.append(errstr);
     if (!string_suffixes_string(L"\n", errstr)) streams.err.push_back(L'\n');
 
-    // We set the exit code to error, because one occured,
+    // We set the exit code to error, because one occurred,
     // but we don't do an early exit so we still print what we can.
     this->exit_code = STATUS_CMD_ERROR;
 }
diff --git a/src/common.cpp b/src/common.cpp
index 7012f2e78..9e060e2f3 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -655,7 +655,7 @@ ssize_t read_loop(int fd, void *buff, size_t count) {
 }
 
 /// Hack to not print error messages in the tests. Do not call this from functions in this module
-/// like `debug()`. It is only intended to supress diagnostic noise from testing things like the
+/// like `debug()`. It is only intended to suppress diagnostic noise from testing things like the
 /// fish parser where we expect a lot of diagnostic messages due to testing error conditions.
 bool should_suppress_stderr_for_tests() {
     return program_name && !std::wcscmp(program_name, TESTS_PROGRAM_NAME);
diff --git a/src/common.h b/src/common.h
index 1065ac2db..fafe40456 100644
--- a/src/common.h
+++ b/src/common.h
@@ -843,7 +843,7 @@ void common_handle_winch(int signal);
 /// Write the given paragraph of output, redoing linebreaks to fit the current screen.
 wcstring reformat_for_screen(const wcstring &msg);
 
-/// Make sure the specified direcotry exists. If needed, try to create it and any currently not
+/// Make sure the specified directory exists. If needed, try to create it and any currently not
 /// existing parent directories.
 ///
 /// \return 0 if, at the time of function return the directory exists, -1 otherwise.
diff --git a/src/complete.h b/src/complete.h
index cdf49240a..67fe20c84 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -152,7 +152,7 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
 /// \param option_type The type of option: can be option_type_short (-x),
 ///        option_type_single_long (-foo), option_type_double_long (--bar).
 /// \param result_mode Controls how to search further completions when this completion has been
-/// succesfully matched.
+/// successfully matched.
 /// \param comp A space separated list of completions which may contain subshells.
 /// \param desc A description of the completion.
 /// \param condition a command to be run to check it this completion should be used. If \c condition
diff --git a/src/expand.cpp b/src/expand.cpp
index 32fcf6d4e..4094a68ea 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -593,7 +593,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
     if (exec_subshell(subcmd, parser, sub_res, true /* apply_exit_status */,
                       true /* is_subcmd */) == -1) {
         append_cmdsub_error(errors, SOURCE_LOCATION_UNKNOWN,
-                            L"Unknown error while evaulating command substitution");
+                            L"Unknown error while evaluating command substitution");
         return false;
     }
 
diff --git a/src/expand.h b/src/expand.h
index 3737d8494..9accf704b 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -92,7 +92,7 @@ enum : wchar_t {
     /// Character representing an empty variable expansion. Only used transitively while expanding
     /// variables.
     VARIABLE_EXPAND_EMPTY,
-    /// This is a special psuedo-char that is not used other than to mark the end of the the special
+    /// This is a special pseudo-char that is not used other than to mark the end of the the special
     /// characters so we can sanity check the enum range.
     EXPAND_SENTINAL
 };
@@ -146,7 +146,7 @@ __warn_unused expand_result_t expand_string(wcstring input, std::vector<completi
 /// \param parser the parser to use for command substitutions, or nullptr to disable.
 /// \param errors Resulting errors, or NULL to ignore
 ///
-/// \return Whether expansion succeded
+/// \return Whether expansion succeeded
 bool expand_one(wcstring &inout_str, expand_flags_t flags, const environment_t &vars,
                 const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = NULL);
 
diff --git a/src/fallback.h b/src/fallback.h
index 855bf4616..04f56158c 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -60,7 +60,7 @@ struct winsize {
 #endif
 
 #if defined(TPARM_SOLARIS_KLUDGE)
-/// Solaris tparm has a set fixed of paramters in its curses implementation, work around this here.
+/// Solaris tparm has a set fixed of parameters in its curses implementation, work around this here.
 #define tparm tparm_solaris_kludge
 char *tparm_solaris_kludge(char *str, long p1 = 0, long p2 = 0, long p3 = 0, long p4 = 0,
                            long p5 = 0, long p6 = 0, long p7 = 0, long p8 = 0, long p9 = 0);
diff --git a/src/highlight.h b/src/highlight.h
index 872405ec8..ec35e1cfe 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -91,7 +91,7 @@ void highlight_shell(const wcstring &buffstr, std::vector<highlight_spec_t> &col
 void highlight_shell_no_io(const wcstring &buffstr, std::vector<highlight_spec_t> &color,
                            size_t pos, wcstring_list_t *error, const environment_t &vars);
 
-/// Perform syntax highlighting for the text in buff. Matching quotes and paranthesis are
+/// Perform syntax highlighting for the text in buff. Matching quotes and parenthesis are
 /// highlighted. The result is stored in the color array as a color_code from the HIGHLIGHT_ enum
 /// for each character in buff.
 ///
diff --git a/src/history.cpp b/src/history.cpp
index 796e89919..e3b7e61cb 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -427,7 +427,7 @@ void history_impl_t::remove(const wcstring &str_to_remove) {
             new_items.erase(new_items.begin() + idx);
             // If this index is before our first_unwritten_new_item_index, then subtract one from
             // that index so it stays pointing at the same item. If it is equal to or larger, then
-            // we have not yet writen this item, so we don't have to adjust the index.
+            // we have not yet written this item, so we don't have to adjust the index.
             if (idx < first_unwritten_new_item_index) {
                 first_unwritten_new_item_index--;
             }
diff --git a/src/input.cpp b/src/input.cpp
index afacf24eb..565ecd1a7 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -263,7 +263,7 @@ static maybe_t<char_event_t> interrupt_handler() {
     // Reap stray processes, including printing exit status messages.
     // TODO: shouldn't need this parser here.
     if (job_reap(parser, true)) reader_repaint_needed();
-    // Tell the reader an event occured.
+    // Tell the reader an event occurred.
     if (reader_reading_interrupted()) {
         auto vintr = shell_modes.c_cc[VINTR];
         if (vintr == 0) {
diff --git a/src/iothread.h b/src/iothread.h
index 10c0bc3c3..ae3395471 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -13,7 +13,7 @@
 /// pointer, and returns an int, which is passed to the completionCallback.
 /// \param completionCallback The function to execute on the main thread once the background thread
 /// is complete. Accepts an int (the return value of handler) and the context.
-/// \param context A arbitary context pointer to pass to the handler and completion callback.
+/// \param context An arbitrary context pointer to pass to the handler and completion callback.
 /// \return A sequence number, currently not very useful.
 int iothread_perform_base(int (*handler)(void *), void (*completionCallback)(void *, int),
                           void *context);
@@ -23,7 +23,7 @@ int iothread_perform_base(int (*handler)(void *), void (*completionCallback)(voi
 /// \return A file descriptor on which to listen for completion callbacks.
 int iothread_port(void);
 
-/// Services one iothread competion callback.
+/// Services one iothread completion callback.
 void iothread_service_completion(void);
 
 /// Waits for all iothreads to terminate.
diff --git a/src/pager.h b/src/pager.h
index dcf0b186c..42b47a735 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -82,7 +82,7 @@ class pager_t {
    public:
     /// Data structure describing one or a group of related completions.
     struct comp_t {
-        /// The list of all completin strings this entry applies to.
+        /// The list of all completion strings this entry applies to.
         wcstring_list_t comp;
         /// The description.
         wcstring desc;
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 238d38491..6b99bebfd 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -248,7 +248,7 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
     const size_t bufflen = std::wcslen(buff);
     assert(cursor_pos <= bufflen);
 
-    // ap and bp are the beginning and end of the tightest command substitition found so far.
+    // ap and bp are the beginning and end of the tightest command substitution found so far.
     const wchar_t *ap = buff, *bp = buff + bufflen;
     const wchar_t *pos = buff;
     for (;;) {
diff --git a/src/parse_util.h b/src/parse_util.h
index 3ce8fb3ab..7eca9a88f 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -13,8 +13,8 @@
 /// Find the beginning and end of the first subshell in the specified string.
 ///
 /// \param in the string to search for subshells
-/// \param begin the starting paranthesis of the subshell
-/// \param end the ending paranthesis of the subshell
+/// \param begin the starting parenthesis of the subshell
+/// \param end the ending parenthesis of the subshell
 /// \param accept_incomplete whether to permit missing closing parenthesis
 /// \return -1 on syntax error, 0 if no subshells exist and 1 on success
 int parse_util_locate_cmdsubst(const wchar_t *in, wchar_t **begin, wchar_t **end,
diff --git a/src/parser.h b/src/parser.h
index 5b826e3ae..61189957a 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -346,7 +346,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     void emit_profiling(const char *path) const;
 
     /// Returns the file currently evaluated by the parser. This can be different than
-    /// reader_current_filename, e.g. if we are evaulating a function defined in a different file
+    /// reader_current_filename, e.g. if we are evaluating a function defined in a different file
     /// than the one curently read.
     const wchar_t *current_filename() const;
 
diff --git a/src/path.cpp b/src/path.cpp
index 2532b13f6..976103df2 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -293,7 +293,7 @@ struct base_directory_t {
     wcstring path{};       /// the path where we attempted to create the directory.
     bool success{false};   /// whether creating the directory succeeded.
     int err{0};            /// the error code if creating the directory failed.
-    bool used_xdg{false};  /// whether an XDG variable was used in resolving the direcotry.
+    bool used_xdg{false};  /// whether an XDG variable was used in resolving the directory.
 };
 
 /// Attempt to get a base directory, creating it if necessary. If a variable named \p xdg_var is
diff --git a/src/reader.cpp b/src/reader.cpp
index 79e5346fe..2c83ad2ec 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2412,7 +2412,7 @@ maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rl
             break;
         }
         // Only allow commands on the first key; otherwise, we might have data we
-        // need to insert on the commandline that the commmand might need to be able
+        // need to insert on the commandline that the command might need to be able
         // to see.
         auto next_event = inputter.readch(false);
         if (event_is_normal_char(next_event)) {
diff --git a/src/sanity.h b/src/sanity.h
index 202f0d9e2..e156dd28d 100644
--- a/src/sanity.h
+++ b/src/sanity.h
@@ -9,7 +9,7 @@ void sanity_lose();
 ///
 /// \param ptr The pointer to validate
 /// \param err A description of what the pointer refers to, for use in error messages
-/// \param null_ok Wheter the pointer is allowed to point to 0
+/// \param null_ok Whether the pointer is allowed to point to 0
 void validate_pointer(const void *ptr, const wchar_t *err, int null_ok);
 
 #endif
diff --git a/src/screen.cpp b/src/screen.cpp
index e4d248c84..a96d22a44 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -80,7 +80,7 @@ static size_t try_sequence(const char *seq, const wchar_t *str) {
     return 0;  // this should never be executed
 }
 
-/// Returns the number of columns left until the next tab stop, given the current cursor postion.
+/// Returns the number of columns left until the next tab stop, given the current cursor position.
 static size_t next_tab_stop(size_t current_line_width) {
     // Assume tab stops every 8 characters if undefined.
     size_t tab_width = init_tabs > 0 ? (size_t)init_tabs : 8;
@@ -286,7 +286,7 @@ void layout_cache_t::add_prompt_layout(wcstring input, prompt_layout_t layout) {
 
 /// Calculate layout information for the given prompt. Does some clever magic to detect common
 /// escape sequences that may be embedded in a prompt, such as those to set visual attributes.
-/// escape sequences that may be embeded in a prompt, such as those to set visual attributes.
+/// escape sequences that may be embedded in a prompt, such as those to set visual attributes.
 static prompt_layout_t calc_prompt_layout(const wcstring &prompt_str, layout_cache_t &cache) {
     if (auto cached_layout = cache.find_prompt_layout(prompt_str)) {
         return *cached_layout;
diff --git a/src/screen.h b/src/screen.h
index b5c301e4d..d4f3e277c 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -155,7 +155,7 @@ class screen_t {
 };
 
 /// This is the main function for the screen putput library. It is used to define the desired
-/// contents of the screen. The screen command will use it's knowlege of the current contents of the
+/// contents of the screen. The screen command will use its knowledge of the current contents of the
 /// screen in order to render the desired output using as few terminal commands as possible.
 ///
 /// \param s the screen on which to write
diff --git a/src/tokenizer.h b/src/tokenizer.h
index b666fd245..4d918d791 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -31,7 +31,7 @@ enum class redirection_mode_t {
 };
 
 /// Flag telling the tokenizer to accept incomplete parameters, i.e. parameters with mismatching
-/// paranthesis, etc. This is useful for tab-completion.
+/// parenthesis, etc. This is useful for tab-completion.
 #define TOK_ACCEPT_UNFINISHED 1
 
 /// Flag telling the tokenizer not to remove comments. Useful for syntax highlighting.
diff --git a/src/topic_monitor.h b/src/topic_monitor.h
index c0673c712..36b2e2594 100644
--- a/src/topic_monitor.h
+++ b/src/topic_monitor.h
@@ -63,7 +63,7 @@ constexpr generation_t invalid_generation = std::numeric_limits<generation_t>::m
 /// The initial value of a generation is always 0.
 using generation_list_t = enum_array_t<generation_t, topic_t>;
 
-/// Teh topic monitor class. This permits querying the current generation values for topics,
+/// The topic monitor class. This permits querying the current generation values for topics,
 /// optionally blocking until they increase.
 class topic_monitor_t {
    private:
diff --git a/src/wildcard.h b/src/wildcard.h
index 6f8a58df1..dd4b7827e 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -1,5 +1,5 @@
 // My own globbing implementation. Needed to implement this instead of using libs globbing to
-// support tab-expansion of globbed paramaters.
+// support tab-expansion of globbed parameters.
 #ifndef FISH_WILDCARD_H
 #define FISH_WILDCARD_H
 
@@ -17,7 +17,7 @@ enum {
     ANY_STRING,
     /// Character representing any character string.
     ANY_STRING_RECURSIVE,
-    /// This is a special psuedo-char that is not used other than to mark the
+    /// This is a special pseudo-char that is not used other than to mark the
     /// end of the the special characters so we can sanity check the enum range.
     ANY_SENTINAL
 };
@@ -32,7 +32,7 @@ enum {
 /// wildcard_expand for matches. On the last segment, matching is made to any file, and all matches
 /// are inserted to the list.
 ///
-/// If wildcard_expand encounters any errors (such as insufficient priviliges) during matching, no
+/// If wildcard_expand encounters any errors (such as insufficient privileges) during matching, no
 /// error messages will be printed and wildcard_expand will continue the matching process.
 ///
 /// \param wc The wildcard string
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index db6855dbf..260a582af 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -220,7 +220,7 @@ begin
             set test16res $test16res $__fish_test_universal_variables_variable_foo
 
             # This sequence seems pointless but it's really verifying that we
-            # succesfully expose higher scopes as we erase the closest scope.
+            # successfully expose higher scopes as we erase the closest scope.
             set -e __fish_test_universal_variables_variable_foo
             set test16res $test16res $__fish_test_universal_variables_variable_foo
 
diff --git a/tests/checks/wraps.fish b/tests/checks/wraps.fish
index febe10a54..3424ed958 100644
--- a/tests/checks/wraps.fish
+++ b/tests/checks/wraps.fish
@@ -2,7 +2,7 @@
 # Validate some things about command wrapping.
 
 # This tests that we do not trigger a combinatorial explosion - see #5638.
-# Ensure it completes successully.
+# Ensure it completes successfully.
 complete -c testcommand --wraps "testcommand x "
 complete -c testcommand --wraps "testcommand y "
 complete -c testcommand --no-files -a normal
diff --git a/tests/locale.in b/tests/locale.in
index 396a40b43..ccdd87439 100644
--- a/tests/locale.in
+++ b/tests/locale.in
@@ -41,7 +41,7 @@ end
 echo -n X\u00FBX | display_bytes
 echo X\u00FCX | env LC_ALL=C ../test/root/bin/fish -c 'read foo; echo -n $foo' | display_bytes
 
-# The next tests deliberately spawn another fish instance to test inheritence of env vars.
+# The next tests deliberately spawn another fish instance to test inheritance of env vars.
 
 # This test is subtle. Despite the presence of the \u00fc unicode char (a "u"
 # with an umlaut) the fact the locale is C/POSIX will cause the \xfc byte to
diff --git a/tests/test2.in b/tests/test2.in
index 2a5ce81ee..1aabc9204 100644
--- a/tests/test2.in
+++ b/tests/test2.in
@@ -1,4 +1,4 @@
-#Tests complex parameter expantions
+#Tests complex parameter expansions
 
 set a A
 set aa AA