[PATCH] Completion: Fix typos

[dana <dana@xxxxxxx>]

Just a bunch of trivial option-description typos i found with aspell

dana


diff --git a/Completion/BSD/Command/_bsd_pkg b/Completion/BSD/Command/_bsd_pkg
index d8928afaf..25d4f346a 100644
--- a/Completion/BSD/Command/_bsd_pkg
+++ b/Completion/BSD/Command/_bsd_pkg
@@ -215,7 +215,7 @@ _bsd_pkg() {
         '-N[show which packages each package was built with]'
         '-n[show which packages each package needs]'
         '-p[show installation prefixes]'
-        '-Q[show the definition of the speficied variable from the build information]:variable:'
+        '-Q[show the definition of the specified variable from the build information]:variable:'
         '-r[show list of installed requiring packages recursively]'
         '-S[show total size occupied by each package and its dependents]'
         '-u[show information for all user-installed packages]'
@@ -227,7 +227,7 @@ _bsd_pkg() {
       flags+=(
         '(:)-A[show all installed packages, including internal packages]'
         '-C[show certificate information]'
-        '-E[show the package that contains the speficied file]:file:_files'
+        '-E[show the package that contains the specified file]:file:_files'
         # XXX only with -L
         '-K[prefix filenames with category keywords]'
         '-M[show the install-message file]'
diff --git a/Completion/BSD/Command/_fetch b/Completion/BSD/Command/_fetch
index ac1264bf8..eef5ffd96 100644
--- a/Completion/BSD/Command/_fetch
+++ b/Completion/BSD/Command/_fetch
@@ -23,7 +23,7 @@ _arguments -s -S \
   '(-N --netrc)'{-N+,--netrc=}'[use file instead of ~/.netrc to look up login names and pass- words for FTP sites]' \
   '(-n --no-mtime)'{-n,--no-mtime}"[don't preserve the modification time]" \
   '--no-passive[force FTP code to use active mode]' \
-  '--no-proxy=[hosts on which to disable proxoes]:host:_sequence _hosts' \
+  '--no-proxy=[hosts on which to disable proxies]:host:_sequence _hosts' \
   '--no-sslv3' '--no-tlsv1' --no-verify-hostname --no-verify-peer \
   '(-o --output)'{-o+,--output=}'[set the output file name]:file:_files' \
   '-P' \
diff --git a/Completion/Darwin/Command/_hdiutil b/Completion/Darwin/Command/_hdiutil
index 13133b1f9..c31808716 100644
--- a/Completion/Darwin/Command/_hdiutil
+++ b/Completion/Darwin/Command/_hdiutil
@@ -220,7 +220,7 @@ _hdiutil(){
         "-uid[uid of root directory]:uid in number" \
         "-gid[gid of root directory]:gid in number" \
         "-mode[mode of root directory]:mode" \
-        "-nouuid[suppress addiing a UUID]" \
+        "-nouuid[suppress adding a UUID]" \
         "(-noautostretch)-autostretch" \
         "(-autostretch)-noautostretch" \
         "-stretch[max_stretch]: :_hdiutil_imagesize" \
diff --git a/Completion/Darwin/Command/_otool b/Completion/Darwin/Command/_otool
index 8c6c00867..c3fc70b91 100644
--- a/Completion/Darwin/Command/_otool
+++ b/Completion/Darwin/Command/_otool
@@ -20,7 +20,7 @@ _arguments \
   '-I[display the indirect symbol table]' \
   '-T[display the table of contents for a dynamic shared library]' \
   '-R[display the reference table of a dynamic shared library]' \
-  '-M[display the module table of dymamic shared library]' \
+  '-M[display the module table of dynamic shared library]' \
   '-H[display the two-level namespace hints table]' \
   '-G[display the data in code table]' \
   '-C[display the linker optimization hints]' \
@@ -35,7 +35,7 @@ _arguments \
   '-j[with disassembly, print opcode bytes]' \
   "-Q[use otool's disassembler]" \
   '-arch[select the specified architecture from a universal file]:arch:(i386 x86_64)' \
-  '-m[object file names are not assuemd to be in archive(member) syntax]' \
+  '-m[object file names are not assumed to be in archive(member) syntax]' \
   '(- *)--version[print version of otool]' \
   '*:file:_object_files' && return 0
 
diff --git a/Completion/Darwin/Command/_sc_usage b/Completion/Darwin/Command/_sc_usage
index 3a11a1bff..17909ce6f 100644
--- a/Completion/Darwin/Command/_sc_usage
+++ b/Completion/Darwin/Command/_sc_usage
@@ -5,6 +5,6 @@ _arguments -s -A '-*' : \
   '-e[sort output by call count]' \
   '-l[use scrolling output style instead of window updating style]' \
   '-s+[specify sampling interval]:seconds' \
-  '(- :)-E[specify command path and args to excute]: :_absolute_command_paths:*:: :_normal' \
+  '(- :)-E[specify command path and args to execute]: :_absolute_command_paths:*:: :_normal' \
   '1: : _alternative "processes:: _pids"
 	"processes-names:: _process_names -a"'
diff --git a/Completion/Debian/Command/_aptitude b/Completion/Debian/Command/_aptitude
index f79a100a8..bbaa8ebbd 100644
--- a/Completion/Debian/Command/_aptitude
+++ b/Completion/Debian/Command/_aptitude
@@ -56,7 +56,7 @@ _arguments -C \
   '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format:_aptitude_format_strings' \
   '(-O --sort)'{-O,--sort}'[specify sort order]:sort order:()' \
   '(-w --width)'{-w,--width}'[specify output width]:width' \
-  '-f[aggressivley try to fix dependencies of broken packages]' \
+  '-f[aggressively try to fix dependencies of broken packages]' \
   '(-V --show-versions)'{-V,--show-versions}'[show which versions of packages will be installed]' \
   '(-D --show-deps)'{-D,--show-deps}'[show brief explanations of automatic installations and removals]' \
   '-Z[show disk space changes for each package]' \
diff --git a/Completion/Debian/Command/_dpkg b/Completion/Debian/Command/_dpkg
index 3503d09b9..5c8f17f03 100644
--- a/Completion/Debian/Command/_dpkg
+++ b/Completion/Debian/Command/_dpkg
@@ -30,7 +30,7 @@ _dpkg_deb_actions=(
 _dpkg_common_actions=(
   '--help[show help]'
   '--version[show version]'
-  '(--license --licence)'{--license,--licence}'[show licencing]'
+  '(--license --licence)'{--license,--licence}'[show licensing]'
 )
 
 _dpkg_actions=(
diff --git a/Completion/Debian/Command/_vim-addons b/Completion/Debian/Command/_vim-addons
index 0ad39955d..76f701491 100644
--- a/Completion/Debian/Command/_vim-addons
+++ b/Completion/Debian/Command/_vim-addons
@@ -12,7 +12,7 @@ _arguments \
   '(y --system-dir)'{-y,--system-dir}'[set system-wide target directory]' \
   '(-)'{-h,--help}'[show help information]' \
   '(-w --system-wide -t --target-dir)'{-w,--system-wide}'[use system-wide target directory]' \
-  '(-z --silent -v --verbose)'{-z,--silent}'[supress most output]' \
+  '(-z --silent -v --verbose)'{-z,--silent}'[suppress most output]' \
   '1:commands:((
     install\:install\ specified\ addons
     remove\:remove\ specified\ addons
diff --git a/Completion/Linux/Command/_btrfs b/Completion/Linux/Command/_btrfs
index 3ecebe62a..cc42dd153 100644
--- a/Completion/Linux/Command/_btrfs
+++ b/Completion/Linux/Command/_btrfs
@@ -241,7 +241,7 @@ while (( $#state )); do
         qgroup:(assign|remove)) args+=( '1:source path:_files -/'
           '2:destination path:_files -/' '3:path:_files -/' );|
         qgroup:assign) args+=( \!--rescan
-          "--no-rescan[don't do a rescan, even if the assignment will make the quotas inconsitent]" )
+          "--no-rescan[don't do a rescan, even if the assignment will make the quotas inconsistent]" )
         ;;
         qgroup:(create|destroy)) args+=( '1:qgroupid:' '2:path:_files -/' );;
         qgroup:show)
@@ -337,7 +337,7 @@ while (( $#state )); do
             '--init-csum-tree[create a new CRC tree]'
             '--init-extent-tree[create a new extent tree]'
             '--clear-space-cache[clear space cache for v1 or v2]:version:(v1 v2)'
-            '--check-data-csum[verify checkums of data blocks]'
+            '--check-data-csum[verify checksums of data blocks]'
             '(-Q --qgroup-report)'{-Q,--qgroup-report}'[verify qgroup accounting and compare against filesystem accounting]'
             '(-E --subvol-extents)'{-E,--subvol-extents}'[show extent state for the given subvolume]:subvolume id'
             '(-p --progress)'{-p,--progress}'[indicate progress at various checking phases]'
diff --git a/Completion/Linux/Command/_cpupower b/Completion/Linux/Command/_cpupower
index 6713323cb..ae1f1d3d1 100644
--- a/Completion/Linux/Command/_cpupower
+++ b/Completion/Linux/Command/_cpupower
@@ -44,7 +44,7 @@ case $state in
           {-l,--hwlimits}'[show min/max frequency allowed]'
           {-d,--driver}'[show the kernel driver in use]'
           {-p,--policy}'[show the current cpufreq policy]'
-          {-g,--governors}'[show available governers]'
+          {-g,--governors}'[show available governors]'
           {-r,--related-cpus}'[show cpus that run at the same frequency]'
           {-a,--affected-cpus}'[show software controlled cpus]'
           {-s,--stats}'[show cpufreq statistics]'
diff --git a/Completion/Linux/Command/_iptables b/Completion/Linux/Command/_iptables
index ae8d66ea4..43f9f632f 100644
--- a/Completion/Linux/Command/_iptables
+++ b/Completion/Linux/Command/_iptables
@@ -102,7 +102,7 @@ while
 	'--ctreplsrc[match reply source address]:*^!:network:_hosts'
 	'--ctrepldst[match reply destination address]:*^!:network:_hosts'
 	'--ctstatus[match internal conntrack states]:state:(NONE EXPECTED SEEN_REPLY ASSURED)'
-	'--ctexpire[match remaing lifetime]:time'
+	'--ctexpire[match remaining lifetime]:time'
       )
     ;;
     dscp)
diff --git a/Completion/Mandriva/Command/_urpmi b/Completion/Mandriva/Command/_urpmi
index 7951e6a9f..00994c70f 100644
--- a/Completion/Mandriva/Command/_urpmi
+++ b/Completion/Mandriva/Command/_urpmi
@@ -176,7 +176,7 @@ _urpmi() {
 	"($help : -)"{--help,-h}"[print usage information]" \
 	"($help)--allow-force[allow asking user to install packages without dependencies checking and integrity]" \
 	"($help)--allow-nodeps[allow asking user to install packages without dependencies checking]" \
-	"($help)--auto-select[utomatically select packages to upgrade the system]" \
+	"($help)--auto-select[automatically select packages to upgrade the system]" \
 	"($help --env)--bug[output a bug report in given directory]:directory for bug report:_files -/" \
 	"($help -X)--best-output[automatically select text or X interface]" \
 	"($help --noclean)--clean[remove rpm from cache before anything else]" \
diff --git a/Completion/Unix/Command/_chsh b/Completion/Unix/Command/_chsh
index 006aa82a1..802369807 100644
--- a/Completion/Unix/Command/_chsh
+++ b/Completion/Unix/Command/_chsh
@@ -50,7 +50,7 @@ case $OSTYPE in
         args+=(
 	  '(-)'{-u,--usage}'[display short usage message]'
 	  '(-)--help[display help information]'
-	  '(-D --binddn)'{-D+,--binddn=}'[specify LDAP disingushed name to bind]:binddn'
+	  '(-D --binddn)'{-D+,--binddn=}'[specify LDAP distinguished name to bind]:binddn'
 	  '(-P --path)'{-P+,--path=}'[specify path to search for passwd and shadow files]:path:_directories'
 	  '(-q --quiet)'{-q,--quiet}"[don't be verbose]"
 	  '--service=[use specified name service]:service:(files nis nisplus ldap)'
diff --git a/Completion/Unix/Command/_cksum b/Completion/Unix/Command/_cksum
index bb2f60ac7..67f2a7896 100644
--- a/Completion/Unix/Command/_cksum
+++ b/Completion/Unix/Command/_cksum
@@ -91,7 +91,7 @@ case $OSTYPE in
   openbsd*)
     args+=(
       '-b[output in base64]'
-      '(-h)-C+[verify input files against checksums in specifed file]:checksum file:_files'
+      '(-h)-C+[verify input files against checksums in specified file]:checksum file:_files'
       '(-C)-h+[output checksums to specified file]:checksum file:_files'
       '(-n -r)-q[output checksum only, or suppress check success messages]'
     )
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b3e54f7f9..e5e4ee768 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -714,7 +714,7 @@ _git-commit () {
                                                                                                   all\:"show individual files in untracked directories"))' \
     '(-q --quiet -v --verbose)'{-v,--verbose}'[show unified diff of all file changes]' \
     '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress commit summary message]' \
-    '--dry-run[only show list of paths that are to be commited or not, and any untracked]' \
+    '--dry-run[only show list of paths that are to be committed or not, and any untracked]' \
     '(         --no-status)--status[include the output of git status in the commit message template]' \
     '(--status            )--no-status[do not include the output of git status in the commit message template]' \
     '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
@@ -3473,7 +3473,7 @@ _git-filter-branch () {
     '--msg-filter[filter for rewriting commit messages]: :_cmdstring' \
     '--commit-filter[filter for rewriting commit]: :_cmdstring' \
     '--tag-name-filter[filter for rewriting tag names]: :_cmdstring' \
-    '--subdirectory-filter[only look at histor that touches given directory]: :_directories' \
+    '--subdirectory-filter[only look at history that touches given directory]: :_directories' \
     '--prune-empty[ignore empty generated commits]' \
     '--original[namespace where original commits will be stored]:namespace:_directories' \
     '-d[temporary directory used for rewriting]: :_directories' \
@@ -4970,7 +4970,7 @@ _git-diff-tree () {
   _arguments -C -S -s \
     $revision_options \
     '-r[recurse into subdirectories]' \
-    '(-r   )-t[disply tree objects in diff output]' \
+    '(-r   )-t[display tree objects in diff output]' \
     '--root[display root diff]' \
     '-m[do not ignore merges]' \
     '-s[do not show differences]' \
diff --git a/Completion/Unix/Command/_gnutls b/Completion/Unix/Command/_gnutls
index 1c14de791..6035c5f83 100644
--- a/Completion/Unix/Command/_gnutls
+++ b/Completion/Unix/Command/_gnutls
@@ -82,7 +82,7 @@ case "$service" in
       '--benchmark-tls-ciphers[benchmark TLS ciphers]'
       '--priority-list[print list of the supported priority strings]'
       '*--alpn=[enable application layer protocol]:string'
-      '--recordsize=[specify maximum record size to advertize]:record size'
+      '--recordsize=[specify maximum record size to advertise]:record size'
       "--disable-sni[don't send a Server Name]"
       '--single-key-share[send a single key share under TLS1.3]'
       '--post-handshake-auth[enable post-handshake authentication under TLS1.3]'
diff --git a/Completion/Unix/Command/_initctl b/Completion/Unix/Command/_initctl
index 9d444c6d1..2d7c2494b 100644
--- a/Completion/Unix/Command/_initctl
+++ b/Completion/Unix/Command/_initctl
@@ -18,7 +18,7 @@ _initctl_fillarray_events_args ()
         _initctl_events_list+=($match[1])
         # this is a bit tricky, we take the string right of the matched event
         # and parse for \sUPPERCASE=\S (in perl-re syntax) substrings until there are no more matches
-        # since we can't do multiple matches, we concatenated the remaing strings and try again
+        # since we can't do multiple matches, we concatenated the remaining strings and try again
         local stml="$match[2]"
         while [[ "$stml" == (#b)(*)\ ([[:upper:]_]##\=)[^[:space:]](#b)(*) ]]; do
           _initctl_eventargs_list+=($match[2])
diff --git a/Completion/Unix/Command/_java b/Completion/Unix/Command/_java
index 30231c5ee..ee0441d97 100644
--- a/Completion/Unix/Command/_java
+++ b/Completion/Unix/Command/_java
@@ -111,7 +111,7 @@ javadoc)
     '-bottom[specify bottom text]:bottom text:' \
     '-link[generate a link to external reference classes]:document URL:' \
     '-linkoffline[generate a link for external reference class names]:document URL::package list URL:' \
-    '-group[generate tables for each groupes]:group heading::package patterns:' \
+    '-group[generate tables for each group]:group heading::package patterns:' \
     '-nodeprecated[do not document deprecated API]' \
     '-nodeprecatedlist[do not generate deprecated API list]' \
     '-notree[do not generate class and interface hierarchy]' \
diff --git a/Completion/Unix/Command/_ldconfig b/Completion/Unix/Command/_ldconfig
index 3c3fca538..16ce3d680 100644
--- a/Completion/Unix/Command/_ldconfig
+++ b/Completion/Unix/Command/_ldconfig
@@ -62,7 +62,7 @@ case $OSTYPE in
     );|
   openbsd*)
     args+=(
-      '(-m)-U[unconfigure specified directories or inaccessable directories if none specified]'
+      '(-m)-U[unconfigure specified directories or inaccessible directories if none specified]'
     );|
 esac
 
diff --git a/Completion/Unix/Command/_lp b/Completion/Unix/Command/_lp
index 8c7ba7a8a..49bb7fbac 100644
--- a/Completion/Unix/Command/_lp
+++ b/Completion/Unix/Command/_lp
@@ -230,7 +230,7 @@ _lp()
 	'-n[Copies]:copies (1--100):' \
 	'*-o:print job options:_lp_job_options' \
 	'-q[Job priority -- 1 (lowest) to 100 (highest)]:priority:' \
-	'-s[Dont report resulting job IDs]' \
+	"-s[Don't report resulting job IDs]" \
 	'-t[Sets the job name]:job name:' \
 	'-u[Job submission username]:username:_users' \
 	'-H[Time to print]:print time (or enter hh\:mm):(hold immediate restart resume)' \
diff --git a/Completion/Unix/Command/_lz4 b/Completion/Unix/Command/_lz4
index d69091d00..2697c4d11 100644
--- a/Completion/Unix/Command/_lz4
+++ b/Completion/Unix/Command/_lz4
@@ -44,7 +44,7 @@ args=(
   + b # Benchmark-mode options
   "(C c d t)-b-[benchmark file using specified compression level]::compression level:(${(j< >)levels//-/})"
   "(C c d t)-e-[specify upper compression level limit (with -b)]:compression level:(${(j< >)levels//-/})"
-  '(C c d t)-i-[specifiy minimum evaluation time (with -b)]:evaluation time (seconds)'
+  '(C c d t)-i-[specify minimum evaluation time (with -b)]:evaluation time (seconds)'
   + c # Compress-mode options
   "(b d t ${(j< >)levels} -c0 -c1 -c2 -hc)"${^levels}
   '(B b d t -m -r --multiple)-l[compress using legacy (Linux kernel) format]'
diff --git a/Completion/Unix/Command/_nkf b/Completion/Unix/Command/_nkf
index 04977e467..0c4f06fb5 100644
--- a/Completion/Unix/Command/_nkf
+++ b/Completion/Unix/Command/_nkf
@@ -33,7 +33,7 @@ _arguments -s \
   '($inputs)-W16l[Input assumption is UTF-16 (Little Endian; BOM)]' \
   '(-M)-m-[MIME decode]:mime decode:((B\:base64 Q\:quoted S\:strict N\:non-strict 0\:no-decode))' \
   '(-m)-M-[MIME encode]:mime encode:((\:header B\:base64 Q\:quoted))' \
-  '-h-[hirakana<->katakana]:hirakata:((1\:hirakana-\>katakana 2\:katakana-\>hirakana 3\:both))' \
+  '-h-[hiragana<->katakana]:hirakata:((1\:hiragana-\>katakana 2\:katakana-\>hiragana 3\:both))' \
   '-L-[line mode]:line mode:((u\:LF w\:CRLF m\:CR))' \
   '-I[convert non ISO-2022-JP character to GETA]' \
   '(--cap-input --url-input)'{--cap-input,--url-input}'[Convert hex after \: or \%]' \
diff --git a/Completion/Unix/Command/_objdump b/Completion/Unix/Command/_objdump
index 8984925e7..07dbd31de 100644
--- a/Completion/Unix/Command/_objdump
+++ b/Completion/Unix/Command/_objdump
@@ -92,7 +92,7 @@ case $variant in
       '-bind[display Mach-O binding info]'
       '-color[use colored syntax highlighting]'
       '-data-in-code[w -macho: print data in code table]'
-      "-dis-symname=[w -macho: disassemble just the specfied symbol's instructions]"
+      "-dis-symname=[w -macho: disassemble just the specified symbol's instructions]"
       '(-disassemble -d)'{-disassemble,-d}'[display assembler mnemonics for machine instructions]'
       '(-disassemble-all -D)'{-disassemble-all,-D}'[disassemble all instruction sections]'
       '-dsym=[w -macho -g: use the specified .dSYM file for debug info]:dsym file:_files'
diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce
index 3cd99d519..0d007e3bc 100644
--- a/Completion/Unix/Command/_perforce
+++ b/Completion/Unix/Command/_perforce
@@ -2426,7 +2426,7 @@ _perforce_cmd_key() {
   _arguments -s : \
     '(-i -m)-d[delete key]' \
     '(-d -m)-i[increment key value by 1]' \
-    '(-d -i)-m[allow mulitple operations]' \
+    '(-d -i)-m[allow multiple operations]' \
     $keyargs
 }
 
diff --git a/Completion/Unix/Command/_python b/Completion/Unix/Command/_python
index 2fb4a915b..f10106f9b 100644
--- a/Completion/Unix/Command/_python
+++ b/Completion/Unix/Command/_python
@@ -16,7 +16,7 @@ if _pick_variant python3=Python\ 3 python2 --version; then
   )
 else
   args=(
-    '-R[use a pseudo-random salt to make hash values unpredeictable]'
+    '-R[use a pseudo-random salt to make hash values unpredictable]'
     '-Q+[division options]:division option:(old warn warnall new)'
     '(-tt)-t[issue warnings about inconsistent tab usage]'
     '(-t)-tt[issue errors about inconsistent tab usage]'
diff --git a/Completion/Unix/Command/_smartmontools b/Completion/Unix/Command/_smartmontools
index c60322ee0..fe6496664 100644
--- a/Completion/Unix/Command/_smartmontools
+++ b/Completion/Unix/Command/_smartmontools
@@ -4,7 +4,7 @@ local context state state_descr line
 
 _arguments -s -S \
   '(H -i --info)'{-i,--info}'[show identity information for device]' \
-  '(H)--identify=-[show words and bits from indentification data]: : _values -S "" "words and bits"
+  '(H)--identify=-[show words and bits from identification data]: : _values -S "" "words and bits"
     "(n v)b[print all bits]"
     "w[print all words]"
     "(b v)n[suppress printing bits]"
diff --git a/Completion/Unix/Command/_surfraw b/Completion/Unix/Command/_surfraw
index d9df4170d..f945f1ca9 100644
--- a/Completion/Unix/Command/_surfraw
+++ b/Completion/Unix/Command/_surfraw
@@ -54,7 +54,7 @@ case $state in
       cddb)
         _arguments $args \
           '-artists[search artists]' \
-          '-albums[search albulms]' \
+          '-albums[search albums]' \
           '-songs[search songs]' \
           '-all[search all artists, albums and songs]' && ret=0
       ;;
diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index 2bdcc71f5..0416ca05e 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -85,7 +85,7 @@ case $OSTYPE in
       '(-A -a -M)-q[silently ignore nonexistent variables]' \
       '(-M -x)-r[binary output]' \
       '(-a -A -d -e -f -M -r)-w[write mode]' \
-      '(-d -M -r)*-x[hex output. -xx for hexdupm-like output]' \
+      '(-d -M -r)*-x[hex output. -xx for hexdump-like output]' \
       '*:sysctl variable:_multi_parts ${words[(r)-w]:+-S=} -i . sysctlvars'
   ;;
   *)
diff --git a/Completion/Unix/Command/_unison b/Completion/Unix/Command/_unison
index 5725575c5..2a3333742 100644
--- a/Completion/Unix/Command/_unison
+++ b/Completion/Unix/Command/_unison
@@ -34,7 +34,7 @@ _arguments \
     '-backups[keep backup copies of all files]' \
     '-backupsuffix[a suffix to be added to names of backup files]:suffix:' \
     '-confirmbigdel[ask about whole-replica (or path) deletes (default true)]' \
-    '-confirmmerge[ask for confirmation before commiting results of a merge]' \
+    '-confirmmerge[ask for confirmation before committing results of a merge]' \
     '-contactquietly[suppress the "contacting server" message during startup]' \
     '-copyprog[external program for copying large files]:program:_files -g "*(-x)"' \
     '-copyprogrest[variant of copyprog for resuming partial transfers]:program:_files -g "*(-x)"' \
@@ -61,7 +61,7 @@ _arguments \
     '-maxthreads[maximum number of simultaneous file transfers]:number:' \
     '-merge[add a pattern to the merge list]:pattern:' \
     '-mountpoint[abort if this path does not exist]:mountpoint:_files -/' \
-    '-numericids[dont map uid/gid values by user/group names]' \
+    "-numericids[don't map uid/gid values by user/group names]" \
     '-preferpartial[add a pattern to the preferpartial list]:pattern:' \
     '-pretendwin[use creation times for detecting updates]' \
     '-repeat[synchronize repeatedly (text interface only)]:repeat:' \
diff --git a/Completion/Unix/Command/_xmlsoft b/Completion/Unix/Command/_xmlsoft
index 7b4b0b03d..487974fdb 100644
--- a/Completion/Unix/Command/_xmlsoft
+++ b/Completion/Unix/Command/_xmlsoft
@@ -53,7 +53,7 @@ case $service in
       '--catalogs[use SGML catalogs]' \
       '--xinclude[do XInclude processing on document input]' \
       '--xincludestyle[do XInclude processing on stylesheets]' \
-      '--load-trace[print trace of all external entites loaded]' \
+      '--load-trace[print trace of all external entities loaded]' \
       {--profile,--norman}'[dump profiling information]' \
       '1:stylesheet:_files -g "*.xslt#(-.)"' \
       ':file:_files -g "*.xml(-.)"' && return
@@ -71,7 +71,7 @@ case $service in
       '--noenc[ignore any encoding specified inside the document]' \
       "(--output -o)--noout[don't output the result tree]" \
       '--path[provide a set of paths for resources]:paths:_files -/' \
-      '--load-trace[print trace of all external entites loaded]' \
+      '--load-trace[print trace of all external entities loaded]' \
       '--nonet[refuse to fetch DTDs or entities over network]' \
       '--nocompact[do not generate compact text nodes]' \
       '--htmlout[output results as HTML]' \
diff --git a/Completion/X/Command/_setxkbmap b/Completion/X/Command/_setxkbmap
index 486268ed7..882a6f939 100644
--- a/Completion/X/Command/_setxkbmap
+++ b/Completion/X/Command/_setxkbmap
@@ -23,7 +23,7 @@ _setxkbmap() {
     local -a arguments
 
     arguments=(
-        '-compat[compability map]:compability:_setxkbmap_compat'
+        '-compat[compatibility map]:compatibility:_setxkbmap_compat'
         '-config[configuration file]:configuration:_files'
         '-display[display]:display:_x_display'
         '-geometry[geometry component]:geometry:_setxkbmap_geometry'
diff --git a/Completion/X/Command/_vnc b/Completion/X/Command/_vnc
index 70b897e47..d60616f21 100644
--- a/Completion/X/Command/_vnc
+++ b/Completion/X/Command/_vnc
@@ -33,7 +33,7 @@ case $service in
 	'-ls[limit stack space to N Kb]:int:' \
 	'-nolock[disable the locking mechanism]' \
 	'-logo[enable logo in screen saver]' \
-	'-nolisten[dont listen on protocol]:protocol:(tcp)' \
+	"-nolisten[don't listen on protocol]:protocol:(tcp)" \
 	'-p[screen-saver pattern duration (minutes)]:time (minutes):' \
 	'-pn[accept failure to listen on all ports]' \
 	'-nopn[reject failure to listen on all ports]' \
@@ -61,7 +61,7 @@ case $service in
 	'-udpinputport[UDP port for keyboard/pointer data]:port:' \
 	'-rfbport[TCP port for RFB protocol]:port:' \
 	'-rfbwait[max time in ms to wait for RFB client]:time:' \
-	'-nocursor[dont put up a cursor]' \
+	"-nocursor[don't put up a cursor]" \
 	'-rfbauth[use authentication on RFB protocol]:passwd-file:_files' \
 	'-httpd[serve files via HTTP from here]:dir:_files -/' \
 	'-httpport[port for HTTP]:port:' \
@@ -71,7 +71,7 @@ case $service in
 	'-desktop[VNC desktop name (default x11)]:name:' \
 	'-alwaysshared[always treat new clients as shared]' \
 	'-nevershared[never treat new clients as shared]' \
-	'-dontdisconnect[dont disconnect existing clients for new non-shared connections]' \
+	"-dontdisconnect[don't disconnect existing clients for new non-shared connections]" \
 	'-viewonly[let clients only to view the desktop]' \
 	'-localhost[only allow connections from localhost]' \
 	'-interface[only bind to specified interface address]:ipaddr:' \