about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2001-05-29 17:54:08 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2001-05-29 17:54:08 +0000
commit56528ccb661d4985776234c89355a14093063534 (patch)
tree8b84684ff6827f7e30ad6c670a5b80a2c136b9ac
parente4d828b28e73846d24d03b3fada69f769cdcbb33 (diff)
downloadzsh-56528ccb661d4985776234c89355a14093063534.tar.gz
zsh-56528ccb661d4985776234c89355a14093063534.tar.xz
zsh-56528ccb661d4985776234c89355a14093063534.zip
spelling corrections
-rw-r--r--ChangeLog101
-rw-r--r--Completion/BSD/Command/_cvsup4
-rw-r--r--Completion/Base/Completer/_approximate2
-rw-r--r--Completion/Base/Completer/_menu2
-rw-r--r--Completion/Base/Core/_tags2
-rw-r--r--Completion/Base/Utility/_multi_parts6
-rw-r--r--Completion/Base/Utility/_regex_arguments6
-rw-r--r--Completion/Base/Utility/_sep_parts2
-rw-r--r--Completion/Redhat/Command/_rpm2
-rw-r--r--Completion/Unix/Command/_apm2
-rw-r--r--Completion/Unix/Command/_cvs10
-rw-r--r--Completion/Unix/Command/_enscript2
-rw-r--r--Completion/Unix/Command/_imagemagick2
-rw-r--r--Completion/Unix/Command/_java6
-rw-r--r--Completion/Unix/Command/_ls4
-rw-r--r--Completion/Unix/Command/_mount14
-rw-r--r--Completion/Unix/Command/_pbm2
-rw-r--r--Completion/Unix/Command/_perl2
-rw-r--r--Completion/Unix/Command/_prcs30
-rw-r--r--Completion/Unix/Command/_ssh6
-rw-r--r--Completion/Unix/Command/_telnet2
-rw-r--r--Completion/Unix/Command/_wget2
-rw-r--r--Completion/Unix/Type/_path_files8
-rw-r--r--Completion/Zsh/Command/_bindkey2
-rw-r--r--Completion/Zsh/Command/_hash2
-rw-r--r--Completion/Zsh/Command/_which2
-rw-r--r--Completion/compdump2
-rw-r--r--Doc/Zsh/compsys.yo10
-rw-r--r--Doc/Zsh/expn.yo2
-rw-r--r--Doc/Zsh/func.yo2
-rw-r--r--Doc/Zsh/mod_computil.yo2
-rw-r--r--Doc/Zsh/params.yo2
-rw-r--r--Functions/Misc/checkmail2
-rw-r--r--Functions/Misc/zrecompile2
-rw-r--r--Functions/Misc/zstyle+4
35 files changed, 137 insertions, 116 deletions
diff --git a/ChangeLog b/ChangeLog
index e1009b06c..ec6d865ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2001-05-29  Oliver Kiddle  <opk@zsh.org>
+
+	* unposted: Completion/compdump, Completion/BSD/Command/_cvsup,
+	Completion/Base/Completer/_approximate,
+	Completion/Base/Completer/_menu, Completion/Base/Core/_tags,
+	Completion/Base/Utility/_multi_parts,
+	Completion/Base/Utility/_regex_arguments,
+	Completion/Base/Utility/_sep_parts, Completion/Redhat/Command/_rpm,
+	Completion/Unix/Command/_apm, Completion/Unix/Command/_cvs,
+	Completion/Unix/Command/_enscript,
+	Completion/Unix/Command/_imagemagick, Completion/Unix/Command/_java,
+	Completion/Unix/Command/_ls, Completion/Unix/Command/_mount,
+	Completion/Unix/Command/_pbm, Completion/Unix/Command/_perl,
+	Completion/Unix/Command/_prcs, Completion/Unix/Command/_ssh,
+	Completion/Unix/Command/_telnet, Completion/Unix/Command/_wget,
+	Completion/Unix/Type/_path_files, Completion/Zsh/Command/_bindkey,
+	Completion/Zsh/Command/_hash, Completion/Zsh/Command/_which,
+	Doc/Zsh/compsys.yo, Doc/Zsh/expn.yo, Doc/Zsh/func.yo,
+	Doc/Zsh/mod_computil.yo, Doc/Zsh/params.yo, Functions/Misc/checkmail,
+	Functions/Misc/zrecompile, Functions/Misc/zstyle+: spelling corrections
+
 2001-05-29  Bart Schaefer  <schaefer@zsh.org>
 
 	* 1454?: INSTALL: Mention "make check" and its usage.
@@ -100,7 +121,7 @@
 	accept-line-and-down-history not get tripped up by transitory
 	changes to the history data.
 
-2001-05-26  Andrej Borsenkow <bor@zsh.org>
+2001-05-26  Andrej Borsenkow  <bor@zsh.org>
 
 	* 14489: Test/C02cond.ztst: workaround for (probably) find
 	bug on ReliantUNIX made visible by 14484.
@@ -178,7 +199,7 @@
 
 	* unposted: Test/ztst.zsh: Handle line wrapping in ZTST_hashmark.
 
-2001-05-20  Andrej Borsenkow <bor@zsh.org>
+2001-05-20  Andrej Borsenkow  <bor@zsh.org>
 
 	* 14401: Makefile.in, configure.in, Config/config.mk,
 	Config/installfns.sh, Doc/Makefile.in, Src/Makefile.in,
@@ -317,7 +338,7 @@
 	* 14304: Src/hist.c: Fixed an obscure local-history bug that could
 	make the "history" command output something that was slightly wrong.
 
-2001-05-10  Andrej Borsenkow <bor@zsh.org>
+2001-05-10  Andrej Borsenkow  <bor@zsh.org>
 
 	* users/3872: Src/Modules/zftp.c: rename inet_* to avoid clash
 	with Solaris 7 headers.
@@ -450,8 +471,8 @@
 2001-05-03  Oliver Kiddle  <opk@zsh.org>
 
 	* 14216: Completion/Unix/Command/.distfiles,
-        Completion/Unix/Command/_loadkeys, Completion/Unix/Command/_lp,
-        Completion/Unix/Command/_pbm, Completion/Unix/Command/_w3m: minor
+	Completion/Unix/Command/_loadkeys, Completion/Unix/Command/_lp,
+	Completion/Unix/Command/_pbm, Completion/Unix/Command/_w3m: minor
 	completion changes
 
 2001-05-03  Sven Wischnowsky  <wischnow@zsh.org>
@@ -506,7 +527,7 @@
 	for the suffix style; if word contains only a tilde, don't try
 	to expand it
 
-2001-04-30  Andrej Borsenkow <bor@zsh.org>
+2001-04-30  Andrej Borsenkow  <bor@zsh.org>
 
 	* Bart: 14144 (modified): Src/Modules/stat.c: The S_IXUSR,
 	S_IXGRP, S_IXOTH are made external variables in Cygwin 1.3.1 and
@@ -538,10 +559,10 @@
 
 2001-04-26  Clint Adams  <clint@zsh.org>
 
-        * 14125: Src/Modules/termcap.c, Src/Modules/terminfo.c:
+	* 14125: Src/Modules/termcap.c, Src/Modules/terminfo.c:
 	remove static incleanup flag since it is not used.
 
-        * 14123: acconfig.h, configure.in, Src/Modules/termcap.c:
+	* 14123: acconfig.h, configure.in, Src/Modules/termcap.c:
 	don't include curses.h in termcap.c if term.h doesn't need it.
 
 2001-04-26  Sven Wischnowsky  <wischnow@zsh.org>
@@ -598,13 +619,13 @@
 	quotes; fail noisily rather than silently on certain illegal
 	associative array assignments; still more subscripting tests.
 
-2001-04-23  Clint Adams <schizo@debian.org>
+2001-04-23  Clint Adams  <schizo@debian.org>
 
 	* 14078: Doc/Zsh/mod_termcap.yo, Doc/Zsh/mod_terminfo.yo:
 	Document $termcap, change reference to termcap/terminfo
 	'strings' to 'values'.
 
-2001-04-23  Andrej Borsenkow <bor@zsh.org>
+2001-04-23  Andrej Borsenkow  <bor@zsh.org>
 
 	* 14077 : acconfig.h, aczsh.m4, configure.in, Config/defs.mk.in,
 	Src/Makefile.in, Src/mkmakemod.sh, Src/zsh.mdd, Src/Modules/cap.mdd,
@@ -845,11 +866,11 @@
 
 	* 13916: Src/params.c: like 13907, but for backward searches
 
-2001-04-05 Felix Rosencrantz <f_rosencrantz@yahoo.com>
+2001-04-05 Felix Rosencrantz  <f_rosencrantz@yahoo.com>
 
-        * workers/13914: Completion/Unix/Command/_java: Added call to
-        _normal after class to run is specified for java, and added
-        completion for files to extract for "jar -x". 
+	* workers/13914: Completion/Unix/Command/_java: Added call to
+	_normal after class to run is specified for java, and added
+	completion for files to extract for "jar -x".
 
 2001-04-05  Bart Schaefer  <schaefer@zsh.org>
 
@@ -1198,7 +1219,7 @@
 
 2001-03-13  Peter Stephenson  <pws@csr.com>
 
-	* 13611, 13615: Doc/Zsh/zle.yo, Src/init.c, Src/zsh.h, 
+	* 13611, 13615: Doc/Zsh/zle.yo, Src/init.c, Src/zsh.h,
 	Src/Zle/zle_keymap.c: Use termcap to find cursor sequences to
 	bind; default to VT100.  If ^[[? or ^[O? is being bound, bind
 	the other one too.  Also bind cursor keys in viins keymap.
@@ -1214,7 +1235,7 @@
 	* unposted: Completion/Commands/_complete_help: fix to declare tmp
 	as a local variable
 
-2001-03-12  Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2001-03-12  Chmouel Boudjnah  <chmouel@mandrakesoft.com>
 
 	* 13605: Completion/User/_tar, Completion/User/_tar_archive: New tar
 	options -j.
@@ -1225,7 +1246,7 @@
 	filenames containing spaces in zip archives and don't complete lftp
 	from _hosts
 
-2001-03-12  Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2001-03-12  Chmouel Boudjnah  <chmouel@mandrakesoft.com>
 
 	* 13601: Completion/User/_lftp: Add completion for lftp
 
@@ -1264,11 +1285,11 @@
 	* 13591: Completion/User/_init_d: try to find out the sub commands
  	to complete in _init_d
 	
-2001-03-07 Felix Rosencrantz <f_rosencrantz@yahoo.com>
+2001-03-07 Felix Rosencrantz  <f_rosencrantz@yahoo.com>
 
 	* 13590: Test/54compmatch.ztst: Added another test case
-        that covers the bug mentioned in workers/13563.  The case
-        is based on a bug mentioned in workers/13320.
+	that covers the bug mentioned in workers/13563.  The case
+	is based on a bug mentioned in workers/13320.
 
 2001-03-07  Sven Wischnowsky  <wischnow@zsh.org>
 
@@ -1277,7 +1298,7 @@
  	pointer to newly allocated heaps to avoid having to search for a
  	heap with free space in most cases
 	
-2001-03-07  Andrej Borsenkow <bor@zsh.org>
+2001-03-07  Andrej Borsenkow  <bor@zsh.org>
 
 	* unposted: configure.in, aczsh.m4: support building with
 	GCC on ReliantUNIX; use AC_TRY_COMMAND for better diagnostic
@@ -1303,7 +1324,7 @@
 	* 13575: Src/Zle/compmatch.c: another fix for completion matching,
  	CLF_MISS in the wrong cline struct
 	
-2001-03-06  Andrej Borsenkow <bor@zsh.org>
+2001-03-06  Andrej Borsenkow  <bor@zsh.org>
 
 	* 13544, 13568 (Peter): Completion/Core/_ignored,
 	Completion/Core/_main_complete, Completion/Core/_prefix,
@@ -1425,7 +1446,7 @@
 	* 13323: Functions/Zle/edit-command-line: handle
 	multi-line buffers.
 
-2001-02-13  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2001-02-13  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 13431: aczsh.m4,configure.in,Src/Modules/termcap.c,
 	Src/Modules/termcap.mdd,Src/Modules/terminfo.c,
@@ -1468,7 +1489,7 @@
 	* 13439: Test/Makefile.in: "make test" cleans up after killed
 	tests.
 
-2001-02-02  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2001-02-02  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* unposted: Src/mkmakemod.sh: patterns in 13412 were wrong.
 
@@ -1485,22 +1506,22 @@
 
 	* 13420: Completion/User/_tin: new completion function for tin
 
-2001-01-31  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2001-01-31  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 13412: Src/mkmakemod.sh: avoid duplicate subdirectories in
 	recursive build
 
-2001-01-29  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2001-01-29  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* unposted: ChangeLog: typo in previous commit message
 
-2001-01-28 Felix Rosencrantz <f_rosencrantz@yahoo.com>
+2001-01-28 Felix Rosencrantz  <f_rosencrantz@yahoo.com>
 
 	* 13395: Test/54compmatch.ztst, Test/comptest: Added code to
 	test compstate[insert_positions], value of insert_positions are
 	now reported
 
-2001-01-26  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2001-01-26  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 13389: Src/builtin.c: on Cygwin convert path to posix form in
 	cd_do_chdir() to avoid dealing with drives letters
@@ -1514,7 +1535,7 @@
 	* 13384: Src/signals.c: make signal queueing variables be exported
  	to modules
 	
-2001-01-19  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2001-01-19  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 13370 (modified): Src/params.c: do not modify environment when
 	importing it - some library functions may access it. When importing
@@ -1671,7 +1692,7 @@
 	* unposted: Src/jobs.c: rename waitjob() to zwaitjob() to avoid
 	clash with IRIX system function.
 
-2000-12-06  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-12-06  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 13243: Makefile.in: we do not use Makefile in Completion and
 	Functions any more.
@@ -2010,7 +2031,7 @@
 	Completion/Core/_path_files, Doc/Zsh/compsys.yo: rename fake style
 	to fake-files
 
-2000-10-11  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-10-11  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 12958: Cosmo <cosmo@informix.com>: aczsh.m4: fix for NCR compiler
 
@@ -2156,7 +2177,7 @@
 	Completion/Core/_expand, Doc/Zsh/compsys.yo: Change the way the
 	completers are selected for _expand_word; clarify and update doc.
 
-2000-09-20  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-09-20  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 12848: Doc/Zsh/zle.yo: Alphabetize list of parameters
 
@@ -2174,7 +2195,7 @@
 
 	* 12845: Src/Modules/files.c: dynamically allocate pbuf in domove().
 
-2000-09-18  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-09-18  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 12835: Doc/Zsh/compwid.yo: Alphabetize list of special parameters
 
@@ -2247,7 +2268,7 @@
 	* 12793: Completion/Builtins/_zle, Doc/Zsh/compwid.yo,
 	Doc/Zsh/mod_zle.yo: Convert _zle to use _arguments; fix typos.
 
-2000-09-08  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-09-08  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 12779: Src/system.h: Comment out #define _XPG_IV for sinix.
 	It was not correct to set it here, and is not needed with
@@ -2280,7 +2301,7 @@
 	* 12762: Akinori MUSHA: configure.in, Completion/Bsd/_kld:
 	changes for new FreeBSD releases.
 
-2000-09-06  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-09-06  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 12761: Doc/ztexi.yo: `` was converted into " by makeinfo;
 	use `@:` instead. In line, use `{}` for tex, this looks better
@@ -2318,7 +2339,7 @@
 	* 12741: Src/math.c: problem with nested matheval unexpectedly
 	stomping on outputradix.
 
-2000-09-04  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+2000-09-04  Andrej Borsenkow  <Andrej.Borsenkow@mow.siemens.ru>
 
 	* 12736: configure.in: Fix `make install' dependency
 	for Cygwin static build
@@ -2630,10 +2651,10 @@
 
 2000-08-02  Clint Adams  <schizo@debian.org>
 
-        * 12489: Src/Modules/files.c, Src/Modules/parameter.c: check
+	* 12489: Src/Modules/files.c, Src/Modules/parameter.c: check
 	errno change from pathconf() in case of unlimited path length.
 
-        * 12472: configure.in, Src/Modules/files.c,
+	* 12472: configure.in, Src/Modules/files.c,
 	Src/Modules/parameter.c: use pathconf() instead
 	of PATH_MAX if possible.
 
@@ -2687,7 +2708,7 @@
  	select= and yes= may be given both a number and one of the long*
  	values at the same time
 
-2000-07-30  Andrew Main <zefram@zsh.org>
+2000-07-30  Andrew Main  <zefram@zsh.org>
 
 	* 12436: Doc/Zsh/invoke.yo, Src/init.c: Make -b behave like
 	the csh -b, permitting more options to be stacked after it and
@@ -2695,7 +2716,7 @@
 	consistent with all the other single-letter options, rather than
 	having a clashing check of emulation type.
 
-2000-07-30  Andrew Main <zefram@zsh.org>
+2000-07-30  Andrew Main  <zefram@zsh.org>
 
 	* 12434: Doc/Zsh/invoke.yo, Src/init.c, Src/options.c, Src/zsh.h,
 	Src/zsh.mdd: Allow options to be specified on the zsh command line
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
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 0180d6a18..4fa35269c 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -980,7 +980,7 @@ process IDs in the following lines.  If the line does not contain
 process IDs to complete.
 
 Note that the completion function generally has to call the command
-everytime it is called.  Because of that care should be taken to
+every time it is called.  Because of that care should be taken to
 specify only commands that take a short time to run (and that will
 eventually stop at all).
 )
@@ -3109,9 +3109,9 @@ value of 300 (to make it distinguishable from other return values)
 after setting the global `tt(context)', `tt(line)' and `tt(opt_args)'
 parameters as described below, and without resetting any changes made
 to the special parameters such as tt(PREFIX) and tt(words).  This
-allows to write wrapper functions around tt(_arguments) that have to
-be able to find out if they have to make sure that the special
-completion parameters are not reset when they return.
+enables wrapper functions around tt(_arguments) to be able to find out
+if they have to make sure that the special completion parameters are
+not reset when they return.
 
 Note that this means that a function calling tt(_arguments) with at least
 one action containing such a `tt(->)var(string)' has to declare
@@ -3466,7 +3466,7 @@ that the sequence `tt(%d)' is replaced by the var(descr) given as the third
 argument without any leading or trailing white space.  If, after
 removing the white space, the var(descr) is the empty string, the format
 style will not be used and the options put into the var(name) array will
-not contain an explantion string to be displayed above the matches.If
+not contain an explanation string to be displayed above the matches.  If
 tt(_description) is called with more than three arguments,
 the additional var(specs) should be of the form `var(char)tt(:)var(str)'
 and every appearance of `tt(%)var(char)' in the format string will be
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index d7376de62..562e9bef2 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -650,7 +650,7 @@ setting of the tt(PROMPT_PERCENT), tt(PROMPT_SUBST) and
 tt(PROMPT_BANG) options.
 )
 item(tt(X))(
-With this flag parsing errors occuring with the tt(Q) and tt(e) flags or the
+With this flag parsing errors occurring with the tt(Q) and tt(e) flags or the
 pattern matching forms such as `tt(${)var(name)tt(#)var(pattern)tt(})' 
 are reported. Without the flag they are silently ignored.
 )
diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo
index f6ff2a116..78cfde012 100644
--- a/Doc/Zsh/func.yo
+++ b/Doc/Zsh/func.yo
@@ -176,7 +176,7 @@ executed.  If the history mechanism is active (and the line was not
 discarded from the history buffer), the string that the user typed is
 passed as the first argument, otherwise it is an empty string.  The
 actual command that will be executed (including expanded aliases) is
-passed in two differnt forms: the second argument is a single-line,
+passed in two different forms: the second argument is a single-line,
 size-limited version of the command (with things like function bodies
 elided); the third argument contains the full text what what is being
 executed.
diff --git a/Doc/Zsh/mod_computil.yo b/Doc/Zsh/mod_computil.yo
index 8d50c4a45..d4ca8e61d 100644
--- a/Doc/Zsh/mod_computil.yo
+++ b/Doc/Zsh/mod_computil.yo
@@ -79,7 +79,7 @@ findex(comptags)
 findex(comptry)
 xitem(tt(comptags))
 item(tt(comptry))(
-These implements the internals of the tags mechanism.
+These implement the internals of the tags mechanism.
 )
 findex(compvalues)
 item(tt(compvalues))(
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 86f9c7d29..194c475e7 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -280,7 +280,7 @@ braces (`tt({)' and `tt(})'): they must appear either in balanced pairs or
 preceded by a backslash, and backslashes that protect parentheses or
 braces are removed during parsing.  This is because parameter expansions
 may be surrounded balanced braces, and subscript flags are introduced by
-balanced parens.
+balanced parenthesis.
 
 The second difference is that a double-quote (`tt(")') may appear as part
 of a subscript expression without being preceded by a backslash, and
diff --git a/Functions/Misc/checkmail b/Functions/Misc/checkmail
index 9cc743db4..1e03d10a1 100644
--- a/Functions/Misc/checkmail
+++ b/Functions/Misc/checkmail
@@ -1,7 +1,7 @@
 #! /usr/local/bin/zsh
 #
 # This autoloadable function checks the folders specified as arguments
-# for new mails.  The arguments are interpeted in exactly the same way
+# for new mails.  The arguments are interpreted in exactly the same way
 # as the mailpath special zsh parameter (see zshparam(1)).
 #
 # If no arguments are given mailpath is used.  If mailpath is empty, $MAIL
diff --git a/Functions/Misc/zrecompile b/Functions/Misc/zrecompile
index abebbbd9e..325415157 100644
--- a/Functions/Misc/zrecompile
+++ b/Functions/Misc/zrecompile
@@ -15,7 +15,7 @@
 #   -q: Be quiet, i.e.: only set the return status.
 #   -p: If this is given, the arguments are interpreted differently:
 #       they should form one or more sets of arguments for zcompile,
-#       seperated by `--'. For example:
+#       separated by `--'. For example:
 #
 #         zrecompile -p \
 #                    -R ~/.zshrc -- \
diff --git a/Functions/Misc/zstyle+ b/Functions/Misc/zstyle+
index eb3c14df5..81b4f0552 100644
--- a/Functions/Misc/zstyle+
+++ b/Functions/Misc/zstyle+
@@ -1,6 +1,6 @@
 # This makes defining styles a bit simpler by using a single `+' as a
-# special token that allows to append a context name to the previously
-# used context name. Like this:
+# special token that allows one to append a context name to the
+# previously used context name. Like this:
 #
 #   zstyle+ ':foo:bar' style1 value1 \
 #         + ':baz'     style2 value2 \