spelling corrections

26 files changed, 63 insertions, 63 deletions

diff --git a/Completion/BSD/Command/_cvsup b/Completion/BSD/Command/_cvsup
index 326fb722f..a1657e654 100644
--- a/Completion/BSD/Command/_cvsup
+++ b/Completion/BSD/Command/_cvsup
@@ -2,8 +2,8 @@
 
 _arguments -s \
     '-1[disable automatic retries]' \
-    '-a[server must athenticate itself]' \
-    '-A:local adress:_hosts' \
+    '-a[server must authenticate itself]' \
+    '-A:local address:_hosts' \
     '-b:base directory:_files -/' \
     '-c:collections directory:_files -/' \
     '-d:maximum number of deleted files:' \
diff --git a/Completion/Base/Completer/_approximate b/Completion/Base/Completer/_approximate
index 6e094cd45..70c2c926f 100644
--- a/Completion/Base/Completer/_approximate
+++ b/Completion/Base/Completer/_approximate
@@ -2,7 +2,7 @@
 
 # This code will try to correct the string on the line based on the
 # strings generated for the context. These corrected strings will be
-# shown in a list and one can cycle through them as in a menucompletion
+# shown in a list and one can cycle through them as in a menu completion
 # or get the corrected prefix.
 
 # We don't try correction if the string is too short or we have tried it
diff --git a/Completion/Base/Completer/_menu b/Completion/Base/Completer/_menu
index 41fc178ba..0e12cb766 100644
--- a/Completion/Base/Completer/_menu
+++ b/Completion/Base/Completer/_menu
@@ -2,7 +2,7 @@
 
 [[ _matcher_num -gt 1 ]] && return 1
 
-# This completer is an example showing how menucompletion can be
+# This completer is an example showing how menu completion can be
 # implemented with the new completion system.
 # Use this one before the normal _complete completer, as in:
 #
diff --git a/Completion/Base/Core/_tags b/Completion/Base/Core/_tags
index d9f421ba9..23cfec877 100644
--- a/Completion/Base/Core/_tags
+++ b/Completion/Base/Core/_tags
@@ -4,7 +4,7 @@ local prev
 
 # A `--' as the first argument says that we should tell comptags to use
 # the preceding function nesting level. This is only documented here because
-# if everythings goes well, users won't have to worry about it and should
+# if everything goes well, users won't have to worry about it and should
 # not mess with it.
 
 if [[ "$1" = -- ]]; then
diff --git a/Completion/Base/Utility/_multi_parts b/Completion/Base/Utility/_multi_parts
index d0e69b990..2c9f7fb01 100644
--- a/Completion/Base/Utility/_multi_parts
+++ b/Completion/Base/Utility/_multi_parts
@@ -46,7 +46,7 @@ opre="$PREFIX"
 osuf="$SUFFIX"
 orig="$PREFIX$SUFFIX"
 
-# Special handling for menucompletion?
+# Special handling for menu completion?
 
 [[ $compstate[insert] = (*menu|[0-9]*) || -n "$_comp_correct" ||
    ( $#compstate[pattern_match] -ne 0 &&
@@ -149,8 +149,8 @@ while true; do
       if ! zstyle -t ":completion:${curcontext}:" expand suffix ||
          [[ -n "$menu" || -z "$compstate[insert]" ]]; then
 
-        # With menucompletion we add only the ambiguous component with
-        # the prefix collected and a spearator for the matches that
+        # With menu completion we add only the ambiguous component with
+        # the prefix collected and a separator for the matches that
         # have more components.
 
         tmp2="$pre$suf"
diff --git a/Completion/Base/Utility/_regex_arguments b/Completion/Base/Utility/_regex_arguments
index 635cd0e5f..2ace6ba72 100644
--- a/Completion/Base/Utility/_regex_arguments
+++ b/Completion/Base/Utility/_regex_arguments
@@ -9,10 +9,10 @@
 
 ##
 
-# _regex_arguments compiles `regex' and emit the result of the state
+# _regex_arguments compiles `regex' and emits the result of the state
 # machine into the function `funcname'. `funcname' parses a command line
-# according to `regex' and evaluate appropriate actions in `regex'. Before
-# parsing the command line string is genereted by concatinating `words'
+# according to `regex' and evaluates appropriate actions in `regex'. Before
+# parsing the command line string is generated by concatenating `words'
 # (before `PREFIX') and `PREFIX' with a separator NUL ($'\0').
 
 # The `regex' is defined as follows.
diff --git a/Completion/Base/Utility/_sep_parts b/Completion/Base/Utility/_sep_parts
index 4e505dd64..b1fdfd31e 100644
--- a/Completion/Base/Utility/_sep_parts
+++ b/Completion/Base/Utility/_sep_parts
@@ -116,7 +116,7 @@ while [[ $# -gt 0 && "$str" == *${1}* ]]; do
     PREFIX="$str"
   fi
 
-  # We incrementally add suffixes by appending to them the seperators
+  # We incrementally add suffixes by appending to them the separators
   # and the strings from the next array that match the pattern we built.
 
   arr="$2"
diff --git a/Completion/Redhat/Command/_rpm b/Completion/Redhat/Command/_rpm
index e047d23d1..d7e42c2d7 100644
--- a/Completion/Redhat/Command/_rpm
+++ b/Completion/Redhat/Command/_rpm
@@ -181,7 +181,7 @@ _rpm () {
         '--target:specify a build target:->target'\
         '--buildroot:build root directory:_files -/' \
         '--buildarch:architecture for which to build:->target' \
-        '--buildos:ositecture for which to build:' \
+        '--buildos:operating system for which to build:' \
         '--timecheck:time check (seconds):' "$tmp[1]" && ret=0
       ;;
     sigcheck)
diff --git a/Completion/Unix/Command/_apm b/Completion/Unix/Command/_apm
index f4fcaa3ef..7fb035e8e 100644
--- a/Completion/Unix/Command/_apm
+++ b/Completion/Unix/Command/_apm
@@ -12,7 +12,7 @@ _arguments -C -s \
     '(-m)--minutes[print total minutes remaining instead of using an hh:mm format]' \
     '(--suspend)-s[put the machine into suspend mode if possible]' \
     '(-s)--suspend[put the machine into suspend mode if possible]' \
-    '(--stanbdby)-S[put the machine into standby mode if possible]' \
+    '(--standby)-S[put the machine into standby mode if possible]' \
     '(-S)--standby[put the machine into standby mode if possible]' \
     '(--noignore)-n[tell the system not to ignore system-generated APM message]' \
     '(-n)--noignore[tell the system not to ignore system-generated APM message]' \
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 13f60194c..b25a2fd45 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -857,7 +857,7 @@ _cvs_files () {
   _alternative \
     'directories:directory:_cvs_existing_directories' \
     'existing-files:file:_cvs_existing_entries' \
-    'removed-files:removed file:_cvs_nonexisting_entries'
+    'removed-files:removed file:_cvs_nonexistent_entries'
 }
 
 (( $+functions[_cvs_files_modified] )) ||
@@ -865,14 +865,14 @@ _cvs_files_modified () {
   _alternative \
     'directories:directory:_cvs_existing_directories' \
     'existing-files:file:_cvs_modified_entries' \
-    'removed-files:removed file:_cvs_nonexisting_entries'
+    'removed-files:removed file:_cvs_nonexistent_entries'
 }
 
 (( $+functions[_cvs_files_removed] )) ||
 _cvs_files_removed () {
   _alternative \
     'directories:directory:_cvs_existing_directories' \
-    'removed-files:removed file:_cvs_nonexisting_entries'
+    'removed-files:removed file:_cvs_nonexistent_entries'
 }
 
 (( $+functions[_cvs_files_unmaintained] )) ||
@@ -962,8 +962,8 @@ _cvs_nonentried_files () {
   }
 }
 
-(( $+functions[_cvs_nonexisting_entries] )) ||
-_cvs_nonexisting_entries () {
+(( $+functions[_cvs_nonexistent_entries] )) ||
+_cvs_nonexistent_entries () {
   local expl match linedir realdir files
   match=()
   : ${PREFIX:#(#b)(*/)(*)}
diff --git a/Completion/Unix/Command/_enscript b/Completion/Unix/Command/_enscript
index c5de3375a..d10acb25f 100644
--- a/Completion/Unix/Command/_enscript
+++ b/Completion/Unix/Command/_enscript
@@ -103,7 +103,7 @@ _arguments -C -s \
   '--color=-:use color:(false true)' \
   '--download-font=:fontname:' \
   '--filter-stdin=:stdin name:(-)' \
-  '--h-column-height=:holizontal column height:' \
+  '--h-column-height=:horizontal column height:' \
   '--help' \
   '--help-pretty-print' \
   '--highlight-bar-gray=:gray level:' \
diff --git a/Completion/Unix/Command/_imagemagick b/Completion/Unix/Command/_imagemagick
index b297f3498..2d90d6e94 100644
--- a/Completion/Unix/Command/_imagemagick
+++ b/Completion/Unix/Command/_imagemagick
@@ -419,7 +419,7 @@ xtp)
       '-account:password:' \
       '-binary[retrieve files as binary]' \
       '-directory[list directory]' \
-      '-exclude:regualr expression for exclusion:' \
+      '-exclude:regular expression for exclusion:' \
       '-file:output file:_files' \
       '-get[get files]' \
       '-port:port: _ports' \
diff --git a/Completion/Unix/Command/_java b/Completion/Unix/Command/_java
index 5da232231..0e04cb91d 100644
--- a/Completion/Unix/Command/_java
+++ b/Completion/Unix/Command/_java
@@ -54,7 +54,7 @@ javadoc)
     '-overview[specify overview file]:_files' \
     '-public[display public classes and members only]' \
     '-protected[display public/protected classes and members only (default)]' \
-    '-package[display pacages, public/protected classes and members only]' \
+    '-package[display packages, public/protected classes and members only]' \
     '-private[display all classes and members]' \
     '-help[print help message]' \
     '-doclet[specify a doclet]:doclet:->doclet' \
@@ -195,7 +195,7 @@ rmiregistry)
 
 rmid)
   _arguments \
-    '-C-[specify command line argument for child process]:comand line argument for child process:' \
+    '-C-[specify command line argument for child process]:command line argument for child process:' \
     '-log[specify log directory]:directory to place logs:_files -/' \
     '-port[specify port]:port:_ports' \
     '-stop[stop rmid]:' && return 0
@@ -513,7 +513,7 @@ class|doclet)
 
 docsrc)
   if compset -P @; then
-    _wanted files expl 'pacakge/source list file' _files
+    _wanted files expl 'package/source list file' _files
   else
     _wanted files expl 'package or source' _files -g '*.java'
   fi
diff --git a/Completion/Unix/Command/_ls b/Completion/Unix/Command/_ls
index a0216e50c..0e5625cd2 100644
--- a/Completion/Unix/Command/_ls
+++ b/Completion/Unix/Command/_ls
@@ -51,8 +51,8 @@ arguments=( \
   '(--sort -S -U -v -X)-t[sort by time]' \
   '(--sort -S -t -v -X)-U[no sort]' \
   '(--sort -S -t -U -X)-v[sort by version]' \
-  '(--sort -S -t -U -v)-X[sort by extention]' \
-  '(-S -t -U -v -X)--sort=:sort:(size time none version extention)' \
+  '(--sort -S -t -U -v)-X[sort by extension]' \
+  '(-S -t -U -v -X)--sort=:sort:(size time none version extension)' \
   \
   '--color=-::color:(never always auto)' \
   \
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index cbd762583..d858026bd 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -101,7 +101,7 @@ if (( ! $+_fs_any )); then
       'secure[use DES encryption]'
       'grpid[inherit group id of parent directory]'
       '(acl)noacl[don'"'"'t use access control lists]'
-      '(noacl)acl[Use acces control lists for this mount]'
+      '(noacl)acl[use access control lists for this mount]'
       'noac[no attribute or directory caching]'
       'shortdev[server lack support for 32-bit device special files]'
       "$_nfs_access[@]"
@@ -178,15 +178,15 @@ if (( ! $+_fs_any )); then
       '(atime)noatime[don'"'"'t update access time]'
       'f[fake an /etc/mnttab entry]'
       'm[don'"'"'t make an /etc/mnttab entry]'
-      '(noforcedirectio)forcedirectio[do I/O synchronously]'
-      '(forcedirectio)noforcedirectio[do all I/O asynchronously]'
+      '(noforcedirection)forcedirection[do I/O synchronously]'
+      '(forcedirection)noforcedirection[do all I/O asynchronously]'
       '(nointr)intr[allow operations to be interrupted]'
       '(intr)nointr[prevent operations from being interrupted]'
       '(nolargefiles)largefiles[don'"'"' restrict file size]'
       '(largefiles)nolargefiles[restrict file size]'
       '(nologging)logging[log transactions]'
       '(logging)nologging[log transactions]'
-      'onerror[action to recover from error]:action(panic lock umout)'
+      'onerror[action to recover from error]:action(panic lock umount)'
       'quota[turn on quotas]'
       '(ro rw)rq[mount file system read-write with quotas]'
       "$_fs_s5fs[@]"
@@ -202,7 +202,7 @@ if (( ! $+_fs_any )); then
       'nrr[no rock ridge]'
       'notraildot[no trail dot when no extension]'
       'nomaplcase[don'"'"'t force lowercase]'
-      'nosiud[ignore suid and sgid bits]'
+      'nosuid[ignore suid and sgid bits]'
     )
     _fs_nfs=(
       '(fg)bg[retry in the background]'
@@ -214,7 +214,7 @@ if (( ! $+_fs_any )); then
       '(sec secure)kerberos[use kerberos authentication]'
       'noac[no attribute caching]'
       'port[server IP port number]:port:'
-      'posix[posix sematics]'
+      'posix[posix semantics]'
       'proto[specify protocol]:protocol:'\("$(grep -v '^#' /etc/netconfig 2> /dev/null | cut -d ' ' -f 1)"\)
       'public[force public file handle]'
       '(noquota)quota[enable quotas]'
@@ -226,7 +226,7 @@ if (( ! $+_fs_any )); then
       'wsize[specify write buffer size]:write buffer size:(8192)'
       '(kerberos secure)sec[set the security mode]:security mode:(sys dh krb4 none)'
       '(kerberos sec)secure[use Diffie-Hellman public key system]'
-      'vers[set NFS vesion number]:NFS version number:(2 3)'
+      'vers[set NFS version number]:NFS version number:(2 3)'
       "$_nfs_access[@]"
       "$_fs_s5fs[@]"
     ) 
diff --git a/Completion/Unix/Command/_pbm b/Completion/Unix/Command/_pbm
index 0255905f6..66951f040 100644
--- a/Completion/Unix/Command/_pbm
+++ b/Completion/Unix/Command/_pbm
@@ -554,7 +554,7 @@ ppmforge)
              '-mesh:FFT mesh size:' '-power:elevations power factor:' \
              '-glaciers:glacier elevation:' '-ice:polar ice cap extent:' \
              '-saturation:star color saturation:' \
-             '-seed:randum number seed:' \
+             '-seed:random number seed:' \
              '-stars:minimum star pixel percentage:' \
  	     '(-xsize)-width:width:'   '(-width)-xsize:width:' \
  	     '(-ysize)-height:height:' '(-height)-ysize:height:'
diff --git a/Completion/Unix/Command/_perl b/Completion/Unix/Command/_perl
index ff97edb5f..d9554e431 100644
--- a/Completion/Unix/Command/_perl
+++ b/Completion/Unix/Command/_perl
@@ -24,7 +24,7 @@ _perl () {
     "-P[run script through C preprocessor before compilation]" \
     "-s[enable some switch parsing for switches after script name]" \
     "-S[look for the script using PATH environment variable]" \
-    "-T[turn on tainting checks]" \
+    "-T[turn on tainted checks]" \
     "-u[dump core after parsing script]" \
     "-U[allow unsafe operations]" \
     "-v[print version number, patchlevel plus VERY IMPORTANT perl info]" \
diff --git a/Completion/Unix/Command/_prcs b/Completion/Unix/Command/_prcs
index 5f964fbac..c5a5313b1 100644
--- a/Completion/Unix/Command/_prcs
+++ b/Completion/Unix/Command/_prcs
@@ -92,8 +92,8 @@ else
     ;;
   checkin)
     _prcs_arguments \
-      '(-r)--revison=[version of the project]:revision:' \
-      '(--revison)-r[version of the project]:revision:' \
+      '(-r)--revision=[version of the project]:revision:' \
+      '(--revision)-r[version of the project]:revision:' \
       '(-s)--skilled-merge[turn off most of the safety features of merge]' \
       '(--skilled-merge)-s[turn off most of the safety features of merge]' \
       ':project name:_prcs_projects' \
@@ -101,8 +101,8 @@ else
     ;;
   checkout)
     _prcs_arguments \
-      '(-r)--revison=[version of the project]:revision:' \
-      '(--revison)-r[version of the project]:revision:' \
+      '(-r)--revision=[version of the project]:revision:' \
+      '(--revision)-r[version of the project]:revision:' \
       '(-p)--preserve[preserve permissions on files that are checked out]' \
       '(--preserve)-p[preserve permissions on files that are checked out]' \
       "(-u)--unlink[don't overwrite symbolic link references]" \
@@ -117,8 +117,8 @@ else
     ;;
   delete)
     _prcs_arguments \
-      '(-r)--revison=[version of the project]:reversion:' \
-      '(--revison)-r[version of the project]:reversion:' \
+      '(-r)--revision=[version of the project]:reversion:' \
+      '(--revision)-r[version of the project]:reversion:' \
       ':project name:_prcs_projects'
     ;;
   depopulate)
@@ -128,7 +128,7 @@ else
     ;;
   diff)
     _prcs_arguments \
-      '*--revison=[version of the project]:revision:' \
+      '*--revision=[version of the project]:revision:' \
       '*-r[version of the project]:revision:' \
       '(-k)--keywords[compare keywords too]' \
       '(--keywords)-k[compare keywords too]' \
@@ -142,8 +142,8 @@ else
     ;;
   execute)
       _prcs_arguments \
-	'(-r)--revison=[version of the project]:reversion:' \
-	'(--revison)-r[version of the project]:reversion:' \
+	'(-r)--revision=[version of the project]:reversion:' \
+	'(--revision)-r[version of the project]:reversion:' \
 	'--pre[list directories first]' \
 	'(--pipe)--all[execute command once, with all files as arguments]' \
 	'(--all)--pipe[supply file contents as the standard input]' \
@@ -155,16 +155,16 @@ else
     ;;
   info)
     _prcs_arguments \
-      '(-r)--revison=[version of the project]:revision:' \
-      '(--revison)-r[version of the project]:revision:' \
+      '(-r)--revision=[version of the project]:revision:' \
+      '(--revision)-r[version of the project]:revision:' \
       '--sort=[set sorting type]:sorting type:(version date)' \
       ':project name:_prcs_projects' \
       '*:file or directory:_files'
     ;;
   merge)
     _prcs_arguments \
-      '(-r)--revison=[version of the project]:revision:' \
-      '(--revison)-r[version of the project]:revision:' \
+      '(-r)--revision=[version of the project]:revision:' \
+      '(--revision)-r[version of the project]:revision:' \
       '(-s)--skilled-merge[turn off most of the safety features of merge]' \
       '(--skilled-merge)-s[turn off most of the safety features of merge]' \
       "(-u)--unlink[don't overwrite symbolic link references]" \
@@ -174,8 +174,8 @@ else
     ;;
   package)
     _prcs_arguments \
-      '(-r)--revison=[version of the project]:revision:' \
-      '(--revison)-r[version of the project]:revision:' \
+      '(-r)--revision=[version of the project]:revision:' \
+      '(--revision)-r[version of the project]:revision:' \
       '(-z)--compress=[compress the output]' \
       '(--compress)-z[compress the output]' \
       ':project name:_prcs_projects' \
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 7e81123ef..8b3c8f0c4 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -40,7 +40,7 @@ _ssh () {
       '-N[do not execute a remote command. (protocol version 2 only)]'\
       '*-o[specify extra options]:option string:->option' \
       '-p[specify port on remote host]:port number on remote host:_ports' \
-      '-P[use non priviledged port]' \
+      '-P[use non privileged port]' \
       '-q[quiet operation]' \
       '-t[force pseudo-tty allocation]' \
       '-T[disable pseudo-tty allocation (protocol version 2 only)]'\
@@ -64,7 +64,7 @@ _ssh () {
       option)
         if compset -P '*[= ]'; then
           case "$IPREFIX" in
-          *(#i)(batchmode|compression|fallbacktorsh|forward(agent|x11)|keepalive|passwordauthentication|rhosts(|rsa)authentication|rsaauthentication|usersh|kerberos(authetication|tgtparsing)|usepriviledgedport)*)
+          *(#i)(batchmode|compression|fallbacktorsh|forward(agent|x11)|keepalive|passwordauthentication|rhosts(|rsa)authentication|rsaauthentication|usersh|kerberos(authetication|tgtparsing)|useprivileged)*)
 	    _wanted values expl 'truth value' compadd yes no && ret=0
             ;;
           *(#i)cipher*)
@@ -118,7 +118,7 @@ _ssh () {
                   ProxyCommand RemoteForward RhostsAuthentication \
                   RhostsRSAAuthentication RSAAuthentication \
                   StrictHostKeyChecking TISAuthentication \
-                  UsePriviledgedPort Protocol User UserKnownHostsFile UseRsh \
+                  UsePrivilegedPort Protocol User UserKnownHostsFile UseRsh \
                   XAuthLocation && ret=0
         fi
         ;;
diff --git a/Completion/Unix/Command/_telnet b/Completion/Unix/Command/_telnet
index d9e02ad42..fc8b6a44e 100644
--- a/Completion/Unix/Command/_telnet
+++ b/Completion/Unix/Command/_telnet
@@ -16,7 +16,7 @@ if (( ! $+_telnet_args )); then
     '*\[-E\]*' '-E[disable an escape character]'
     '*\[-K\]*' '-K[no automatic login]'
     '*\[-L\]*' '-L[allow 8-Bit data on output]'
-    '*\[-N\]*' '-N[supress reverse lookup]'
+    '*\[-N\]*' '-N[suppress reverse lookup]'
     '*\[-S tos\]*' '-S+:IP type-of-service:'
     '*\[-X atype\]*' '-X+:authentication type to disable:'
     '*\[-a\]*' '-a[attempt automatic login]'
diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget
index 515f73eda..3f195cc8c 100644
--- a/Completion/Unix/Command/_wget
+++ b/Completion/Unix/Command/_wget
@@ -29,7 +29,7 @@ _arguments -C -s \
   '--spider' \
   {'(--timeout)-T+[timeout]','(-T)--timeout='}':read timeout(seconds):' \
   {'(--wait)-w+[wait]','(-w)--wait='}':wait between retrievals(seconds):' \
-  '--waitretry=:seconds to wait between retries of a retieval:' \
+  '--waitretry=:seconds to wait between retries of a retrieval:' \
   {'(--proxy --use-proxy)-Y+[proxy]','(-Y --use-proxy)--proxy=','(-Y --proxy)--use-proxy='}':proxy:(on off)' \
   {'(--quota)-Q+[quota]','(-Q)--quota='}':number:' \
   '(--force-directories)-x[force directories]' '(-x)--force-directories' \
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index 6a30cf2b8..af8757c22 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -128,7 +128,7 @@ fi
 
 # Check if we have to skip over sequences of slashes. The value of $skips
 # is used below to match the pathname components we always have to accept
-# immediatly.
+# immediately.
 
 if zstyle -t ":completion:${curcontext}:paths" squeeze-slashes; then
   skips='((.|..|)/)##'
@@ -174,7 +174,7 @@ if [[ -n "$compstate[pattern_match]" &&
 fi
 
 # We get the prefix and the suffix from the line and save the whole
-# original string. Then we see if we will do menucompletion.
+# original string. Then we see if we will do menu completion.
 
 pre="$PREFIX"
 suf="$SUFFIX"
@@ -469,8 +469,8 @@ for prepath in "$prepaths[@]"; do
     # enough to handle multiple components with patterns.
 
     if (( tmp4 )); then
-      # It is. For menucompletion we now add the possible completions
-      # for this component with the unambigous prefix we have built
+      # It is. For menu completion we now add the possible completions
+      # for this component with the unambiguous prefix we have built
       # and the rest of the string from the line as the suffix.
       # For normal completion we add the rests of the filenames
       # collected as the suffixes to make the completion code expand
diff --git a/Completion/Zsh/Command/_bindkey b/Completion/Zsh/Command/_bindkey
index 433005cb9..045cba960 100644
--- a/Completion/Zsh/Command/_bindkey
+++ b/Completion/Zsh/Command/_bindkey
@@ -21,7 +21,7 @@ _arguments -C -s -S \
   '(-e -v -a -M -l -d -A -N -m -p -r -s -R *)-D[delete named keymaps]:*:keymap:->keymap' \
   '(-e -v -a -M -l -L -d -D -N -m -p -r -s -R *)-A[create alias to keymap]:old-keymap:->keymap:new-keymap:->keymap' \
   '(-e -v -a -M -l -L -d -D -A -m -p -r -s -R *)-N[create new keymap]:new-keymap:->keymap:old-keymap to copy:->keymap' \
-  '(-l -L -d -D -A -N -p -r -s -r -R *)-m[add builtin meta-key bindings to selected keymape]' \
+  '(-l -L -d -D -A -N -p -r -s -r -R *)-m[add builtin meta-key bindings to selected keymap]' \
   '(-e -v -a -d -D -A -N -m -s -R *)-p[list bindings which have given key sequence as a prefix]:key sequence' \
   '(-l -L -d -D -A -N -m -s *)-r[unbind specified in-strings]:*:in-string' \
   '(-l -L -d -D -A -N -m -p -r *)-s[bind each in-string to each out-string]:*:key string' \
diff --git a/Completion/Zsh/Command/_hash b/Completion/Zsh/Command/_hash
index 4b2a8a6ca..a065615ef 100644
--- a/Completion/Zsh/Command/_hash
+++ b/Completion/Zsh/Command/_hash
@@ -12,7 +12,7 @@ case ${service} in
     _arguments -C -s -S \
       '(-f -m -v)-r[empty hash table]' \
       '(-f -r)-m[treat arguments as patterns]' \
-      '(-f -r -m)-v[list entires as they are added]' \
+      '(-f -r -m)-v[list entries as they are added]' \
       '(-f -r -v)-L[list in the form of calls to hash]' \
       "${common_args[@]}" \
       '(-d -f -r -m -v -L)*:hash:->hashval' && return 0
diff --git a/Completion/Zsh/Command/_which b/Completion/Zsh/Command/_which
index ab6caeba7..279475451 100644
--- a/Completion/Zsh/Command/_which
+++ b/Completion/Zsh/Command/_which
@@ -9,7 +9,7 @@ cargs=( \
   '-s[print symlink free path as well]' \
   '*:commands:->command' )
 farg='-f[output contents of functions]'
-aarg='-a[print all occurences in path]'
+aarg='-a[print all occurrences in path]'
 
 case ${service} in
   whence)
diff --git a/Completion/compdump b/Completion/compdump
index a94a41df6..62840b9fe 100644
--- a/Completion/compdump
+++ b/Completion/compdump
@@ -36,7 +36,7 @@ fi
 print "#files: $#_d_files" > $_d_file
 
 # First dump the arrays _comps, _services and _patcomps.  The quoting
-# hieroglyphyics ensure that a single quote inside a variable is itself
+# hieroglyphics ensure that a single quote inside a variable is itself
 # correctly quoted.
 
 print "_comps=(" >> $_d_file