18472: spelling corrections

30 files changed, 85 insertions, 72 deletions

diff --git a/ChangeLog b/ChangeLog
index 04441be12..fe2aae492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2003-04-25  Oliver Kiddle  <opk@zsh.org>
+
+	* 18472: zshconfig.ac, Completion/Base/Core/_wanted,
+	Completion/Linux/Command/_uml, Completion/Mandrake/Command/_urpmi,
+	Completion/Unix/Command/_figlet, Completion/Unix/Command/_grep,
+	Completion/Unix/Command/_larch, Completion/Unix/Command/_ls,
+	Completion/Unix/Command/_perforce, Completion/Unix/Command/_sccs,
+	Completion/Unix/Command/_texinfo, Completion/Unix/Type/_java_class,
+	Completion/Zsh/Command/_zmv, Doc/zshtcpsys.yo, Doc/Zsh/compsys.yo,
+	Doc/Zsh/mod_tcp.yo, Doc/Zsh/mod_zselect.yo, Doc/Zsh/tcpsys.yo,
+	Doc/Zsh/zle.yo, Functions/Misc/relative, Functions/TCP/tcp_alias,
+	Functions/TCP/tcp_close, Functions/TCP/tcp_read,
+	Functions/Zle/forward-word-match, Functions/Zle/match-words-by-style,
+	Functions/Zle/transpose-words-match, Src/zsh.h, Src/Modules/zselect.c,
+	Test/B03print.ztst: spelling corrections
+
 2003-04-24  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* unposted, c.f. 2003-04-14: Doc/Zsh/compsys.yo: finish
@@ -630,7 +646,7 @@
 2002-12-04  Peter Stephenson  <pws@csr.com>
 
 	* 17979: Doc/Zsh/options.yo, Src/exec.c, Src/options.c, Src/zsh.h:
-	Add ERR_RETURN option, similiar to ERR_EXIT option.
+	Add ERR_RETURN option, similar to ERR_EXIT option.
 
 2002-11-26  Peter Stephenson  <pws@csr.com>
 
@@ -1075,7 +1091,7 @@
 2002-07-05  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 17429: Src/Zle/complist.c: improve interactive mode when
-	there are no matches left (alow to go back with undo)
+	there are no matches left (allow going back with undo)
 
 2002-07-04  Clint Adams  <clint@zsh.org>
 
@@ -1129,7 +1145,7 @@
 	* 17387: Completion/Zsh/Context/.distfiles,
 	Completion/Zsh/Context/_assign, Doc/Zsh/compsys.yo,
 	Doc/Zsh/compwid.yo, Src/zsh.h, Src/Zle/compcore.c,
-	Src/Zle/zle_tricky.c: add new sepcial context
+	Src/Zle/zle_tricky.c: add new special context
 	-assign-parameter- for completing the parameter in an
 	assignment
 
@@ -1234,7 +1250,7 @@
 
 2002-06-02  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
-	* 17273: Src/parse.c: `outer() { inner(); }' succeded; when outer
+	* 17273: Src/parse.c: `outer() { inner(); }' succeeded; when outer
 	ran it created a bogus `inner' which crashed the shell.  Make
 	original command issue error.
 
@@ -1896,7 +1912,7 @@
 
 2002-02-25  Sven Wischnowsky  <wischnow@zsh.org>
 
-	* 16711: Src/loop.c: allow nterruption of empty while-loops
+	* 16711: Src/loop.c: allow interruption of empty while-loops
 	with ^C
 
 	* 16710: Completion/Base/Core/_message, Test/Y03arguments.ztst:
@@ -1907,7 +1923,7 @@
 	Completion/Base/Utility/_guard, Completion/Unix/Command/_grep,
 	Completion/Unix/Command/_pbm, Completion/Unix/Command/_pine,
 	Completion/X/Command/_vnc, Doc/Zsh/compsys.yo,
-	Src/Zle/compcore.c: make _guard use `_mesage -e'; make
+	Src/Zle/compcore.c: make _guard use `_message -e'; make
 	`_message -e' use $curtag as a default; change uses of _guard
 
 2002-02-22  Wayne Davison  <wayned@users.sourceforge.net>
@@ -2189,7 +2205,7 @@
 	in preference to $EDITOR
 
 	* 16464: Completion/Unix/Command/_pine, Completion/Zsh/Command/_zle:
-	fix subtitutions used for exclusion lists and do cleanup of _zle
+	fix substitutions used for exclusion lists and do cleanup of _zle
 
 2002-01-16  Clint Adams  <clint@zsh.org>
 
@@ -2264,7 +2280,7 @@
 2002-01-07  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 16408: Src/Zle/compcore.c: make sure auto menu isn't started
-	accidentially when bashautolist is set
+	accidentally when bashautolist is set
 
 	* 16407: Completion/X/Command/_netscape: fix nested _tags-loops
 	by re-initialising the outer one when leaving the inner one
@@ -3366,7 +3382,7 @@
 2001-07-20  Peter Stephenson  <pws@csr.com>
 
 	* 15432: Functions/Zle/bash-transpose-words, Doc/Zsh/contrib.yo:
-	new bash-branspose-words widget.
+	new bash-transpose-words widget.
 
 2001-07-20  Sven Wischnowsky  <wischnow@zsh.org>
 
@@ -3378,7 +3394,7 @@
 	* 15415: Completion/Base/Utility/_describe, Src/Zle/computil.c:
 	yet another followup to 15407; make _describe filter out
 	non-matching strings before calling compdescribe, otherwise
-	some matches will be hiddens
+	some matches will be hidden
 
 2001-07-18  Sven Wischnowsky  <wischnow@zsh.org>
 
@@ -3390,7 +3406,7 @@
 	Src/Zle/complist.c, Src/Zle/compresult.c, Src/Zle/computil.c:
 	add list-grouped option to make options and such be grouped
 	together if they have the same description; matches with
-	line-display strings can be hidden; hi and du capabalities in
+	line-display strings can be hidden; hi and du capabilities in
 	complist are only used if set by the user
 
 	* 15402 (Akinori Musha): Completion/Unix/Command/_cvs: add
diff --git a/Completion/Base/Core/_wanted b/Completion/Base/Core/_wanted
index f96b266bd..5bba7fd63 100644
--- a/Completion/Base/Core/_wanted
+++ b/Completion/Base/Core/_wanted
@@ -1,9 +1,7 @@
 #autoload
 
-local __targs __gopt
+local -a __targs __gopt
 
-__gopt=()
-__tagrs=()
 zparseopts -D -a __gopt 1 2 V J x C:=__targs
 
 _tags "$__targs[@]" "$1"
diff --git a/Completion/Linux/Command/_uml b/Completion/Linux/Command/_uml
index 453cb625e..0e078e0a3 100644
--- a/Completion/Linux/Command/_uml
+++ b/Completion/Linux/Command/_uml
@@ -113,7 +113,7 @@ while [[ -n $state ]]; do
 	'ncpus[specify number of virtual processors to start]:processors' \
 	'mode[force UML to run in specified mode]:mode:(tt)' \
 	'mconsole[request mconsole driver to send a message to socket]:socket' \
-	'xterm[specify alternate terminal emulator]:terminam emulator:->xterm' \
+	'xterm[specify alternate terminal emulator]:terminal emulator:->xterm' \
 	'dsp[specify host dsp device]:dsp device:_files' \
 	'mixer[specify host mixer device]:mixer device:_files' \
 	'umn[specify ip address for host side of slip device]' && ret=0
diff --git a/Completion/Mandrake/Command/_urpmi b/Completion/Mandrake/Command/_urpmi
index d03dd311f..7f9387f91 100644
--- a/Completion/Mandrake/Command/_urpmi
+++ b/Completion/Mandrake/Command/_urpmi
@@ -153,7 +153,7 @@ _urpmi() {
 	"(--help -h --src -s)"{--src,-s}"[next package is source package]" \
 	"(--help -h)--update[use only update media]" \
 	"(--help -h -c -p -P)-c[choose complete method for resolving requires closure]" \
-	"(--help -h)-d[show package depndencies]" \
+	"(--help -h)-d[show package dependencies]" \
 	"(--help -h)-f[print version, release and arch with name]" \
 	"(--help -h)-g[print groups too with name]" \
 	"(--help -h -c -p -P)-p[allow search in provides to find package]" \
diff --git a/Completion/Unix/Command/_figlet b/Completion/Unix/Command/_figlet
index 607c774d5..0a5ba0a2f 100644
--- a/Completion/Unix/Command/_figlet
+++ b/Completion/Unix/Command/_figlet
@@ -29,7 +29,7 @@ _arguments -s -S \
   "-d+[specify font directory]:font directory:_path_files -/" \
   '-f+[specify font]:font:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flf\*\(\:r\)' \
   '(-k -S -s -o -W)-m+[specify layout mode]:layout mode' \
-  '(-N)-C+[specifiy control file]:control file:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flc\*\(\:r\)' \
+  '(-N)-C+[specify control file]:control file:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flc\*\(\:r\)' \
   "(-v)-I+[display info]:info code:((
     -1\:normal\ operation\ \(default\)
     0\:version,\ copyright\ and\ usage\ information
diff --git a/Completion/Unix/Command/_grep b/Completion/Unix/Command/_grep
index 7df73f7d7..b1dd8aa45 100644
--- a/Completion/Unix/Command/_grep
+++ b/Completion/Unix/Command/_grep
@@ -55,7 +55,7 @@ arguments=( $arguments[@]
   '*--include=[examine files matching specified pattern]:file pattern'
   '*--exclude=[skip files matching specified pattern]:file pattern'
   '*--exclude-from=[skip files matching pattern in specified file]:file:_files'
-  '(--no-mesages -s)'{--no-messages,-s}'[suppress messages about unreadable]'
+  '(--no-messages -s)'{--no-messages,-s}'[suppress messages about unreadable]'
   '(--version -V)'{--version,-V}'[display version info]'
   '(--invert-match -v)'{--invert-match,-v}'[select non-matching lines]'
   '(--word-regexp -w --line-regexp -x)'{--word-regexp,-w}'[force pattern to match only whole words]'
diff --git a/Completion/Unix/Command/_larch b/Completion/Unix/Command/_larch
index 18af3823a..7bd07c8b1 100644
--- a/Completion/Unix/Command/_larch
+++ b/Completion/Unix/Command/_larch
@@ -92,7 +92,7 @@ _larch_command () {
 "show-config:show the revision frontier of a configuration" \
 "config-history:report the history of a configuration" \
 "update:merge local changes with the latest revision" \
-"replay:merge the latest revsion with local changes" \
+"replay:merge the latest revision with local changes" \
 "delta-patch:compute and apply an arbitrary patch" \
 "star-merge:merge of mutually merged branches" \
 "make-sync-tree:prepare a tree that will synchronize branches" \
@@ -1603,7 +1603,7 @@ _larch_library-add () {
 		'--report[default output]' \
 		'--verbose[maximal output]' \
 		'--debug[debugging output]' \
-		'--ignore-extra-args[ignore extra argyments]' \
+		'--ignore-extra-args[ignore extra arguments]' \
 		"--skip-readmes[don't update readme files]" \
 		'*: :_files' \
            && return 0
diff --git a/Completion/Unix/Command/_ls b/Completion/Unix/Command/_ls
index 33c3ca652..e1a9222b3 100644
--- a/Completion/Unix/Command/_ls
+++ b/Completion/Unix/Command/_ls
@@ -8,7 +8,7 @@ arguments=(
   '(--almost-all -A -a --all)'{--almost-all,-A}'[list all except . and ..]'
   '(--ignore-backups -B)'{--ignore-backups,-B}"[don't list entries ending with ~]"
   '(--directory -d)'{--directory,-d}'[list directory entries instead of contents]'
-  '(--ignore,-I)'{--ignore,-I}"[don't list entires matching pattern]:pattern:"
+  '(--ignore,-I)'{--ignore,-I}"[don't list entire matching pattern]:pattern:"
   '(--dereference -L)'{--dereference,-L}'[list referenced file for sym link]'
   '(--recursive -R)'{--recursive,-R}'[list subdirectories recursively]'
  
diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce
index 34db61478..3c7ee914c 100644
--- a/Completion/Unix/Command/_perforce
+++ b/Completion/Unix/Command/_perforce
@@ -13,7 +13,7 @@
 # subcommand e.g.
 #   zstyle ':completion:*:p4-labelsync:*' verbose false
 # or for a particular tag, e.g. changes,
-#   zstyle ':completeion:*:changes' verbose false
+#   zstyle ':completion:*:changes' verbose false
 # or just for top-level completion (i.e. up to and including completion
 # of the subcommand):
 #   zstyle ':completion:*:p4:*' verbose false
@@ -233,7 +233,7 @@ _perforce() {
     fi
 
     if [[ $p4cmd = '=p4' ]]; then
-	_message "p4 excutable not found: completion not available"
+	_message "p4 executable not found: completion not available"
 	return
     fi
 
@@ -497,7 +497,7 @@ _perforce_files_or_minus() {
 }
 
 
-(( $+functions[_perforce_file_suffx] )) ||
+(( $+functions[_perforce_file_suffix] )) ||
 _perforce_file_suffix() {
     # Used with compadd -R to handle @ or # after a file name.
     # Differs from compadd -r '...' in that it quotes `#' if typed.
@@ -734,7 +734,7 @@ _perforce_files() {
 	    labels:label:_perforce_labels \
 	    'dates:date (+ time):_perforce_dates'
     elif [[ -prefix *\# ]]; then
-	# Modify context to indicate we are in a suffx.
+	# Modify context to indicate we are in a suffix.
 	curcontext="${curcontext%:*}:hash-suffix"
 	# Check for existing range syntax
 	[[ $PREFIX = *[@\#]*,* ]] && range=
@@ -919,7 +919,7 @@ _perforce_jobviews() {
     # Ignore up to the last one.  We don't try to complete these.
     compset -P '*[[:blank:]\^\&\|\(\)]'
 
-    # According to the manual, `p4 jobspec' requires admin priveleges.
+    # According to the manual, `p4 jobspec' requires admin privileges.
     # If this is true even of `p4 jobspec -o', we are a bit screwed.
     _call_program jobspec p4 jobspec -o 2>/dev/null | while read line; do
 	case $line in
@@ -1114,7 +1114,7 @@ _perforce_cmd_branch() {
 	'(-o)-f[force operation by superuser]' \
 	'(-o -i)-d[delete branch]' \
 	'(-d -i -f)-o[write specification to standard output]' \
-	'(-d -o)-i[read specificationf from standard input]' \
+	'(-d -o)-i[read specification from standard input]' \
 	'(-i)*::branch name:_perforce_branches'
 }
 
@@ -1464,7 +1464,7 @@ _perforce_cmd_labelsync() {
 	'-a[add files to label]' \
 	'-d[delete files from label]' \
 	'-n[no effect, dummy run]' \
-	'-l[specify lable]:label:_perforce_labels' \
+	'-l[specify label]:label:_perforce_labels' \
 	'*::file:_perforce_files -tR'
 }
 
diff --git a/Completion/Unix/Command/_sccs b/Completion/Unix/Command/_sccs
index 2591ceb16..b3b6f49e9 100644
--- a/Completion/Unix/Command/_sccs
+++ b/Completion/Unix/Command/_sccs
@@ -33,13 +33,13 @@ subcmds=(
   'edit:retrieve file for editing (check out)'
   "enter:like create, but omits the final 'sccs get'"
   'fix:revise a (leaf) delta'
-  'get:retieve a version from the sccs history'
+  'get:retrieve a version from the sccs history'
   'help:get information on sccs commands and error messages'
   {info,tell}':list files being edited'
   'print:print history of specified files'
   'prs:display delta table for an sccs file'
   'prt:display the delta table, but omit the MR field'
-  'rmdel:remove specfied delta from history file'
+  'rmdel:remove specified delta from history file'
   'sact:show editing activity status of an sccs file'
   'sccsdiff:compare two versions from sccs history'
   {unedit,unget}':undo check out'
diff --git a/Completion/Unix/Command/_texinfo b/Completion/Unix/Command/_texinfo
index 5c118f3f0..240111990 100644
--- a/Completion/Unix/Command/_texinfo
+++ b/Completion/Unix/Command/_texinfo
@@ -36,7 +36,7 @@ case $service in
         '--infodir=[specify directory containing dir file]:info directory:_files -/' \
         '--align=[specify minimum indentation for description]:indentation' \
         '--calign=[specify minimum indentation for continuation lines of description]:indentation' \
-        '--maxwidth=[specify maximim width of dir file]:width' \
+        '--maxwidth=[specify maximum width of dir file]:width' \
         '--quiet[suppress informational output]' \
         '--description=[specify description for menu entry]:description' \
         '--menuentry=[specify the menu entry for dir file]:menu entry' \
diff --git a/Completion/Unix/Type/_java_class b/Completion/Unix/Type/_java_class
index 76aeaaa2e..1abca1291 100644
--- a/Completion/Unix/Type/_java_class
+++ b/Completion/Unix/Type/_java_class
@@ -1,7 +1,7 @@
 #autoload
 
 # Should probably add some sort of cache.
-# Should we call _multi_parts insteads of compadd?
+# Should we call _multi_parts instead of compadd?
 
 local classpath i expl
 local -a c
diff --git a/Completion/Zsh/Command/_zmv b/Completion/Zsh/Command/_zmv
index bc639f3ec..df5cb5113 100644
--- a/Completion/Zsh/Command/_zmv
+++ b/Completion/Zsh/Command/_zmv
@@ -15,4 +15,4 @@ _arguments -s -S -A '-*' \
   '(-W)-w[implicitly add parenthesis to wildcards in the pattern]' \
   '(-w)-W[like -w, but turn wildcards in replacement patterns into references]' \
   '1:source pattern:_files' \
-  '2:desination pattern:_files'
+  '2:destination pattern:_files'
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index f30350e59..4009f3324 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1662,7 +1662,7 @@ style must be set to an empty string.
 
 In addition to setting styles for specific tags, it is also possible to
 use group names specified explicitly by the tt(group-name) tag together
-withe the `tt((group))' syntax allowed by the tt(ZLS_COLORS) and
+with the `tt((group))' syntax allowed by the tt(ZLS_COLORS) and
 tt(ZLS_COLOURS) parameters and simply using the tt(default) tag.
 
 It is possible to use any color specifications already set up for the GNU
@@ -3865,7 +3865,7 @@ completed separately.  For example, the tt(_tar) function uses
 from the given array of complete file paths.
 
 The tt(-i) option causes tt(_multi_parts) to insert a unique match even
-that requires multiple separators to be inserted.  This is not usually
+if that requires multiple separators to be inserted.  This is not usually
 the expected behaviour with filenames, but certain other types of
 completion, for example those with a fixed set of possibilities, may be
 more suited to this form.
@@ -3878,7 +3878,7 @@ them to the tt(compadd) builtin.
 findex(_next_label)
 item(tt(_next_label) [ tt(-x) ] [ tt(-12VJ) ] var(tag) var(name) var(descr) [ var(options) ... ])(
 This function is used to implement the loop over different tag
-labels for a particular tag as describe above for the tt(tag-order)
+labels for a particular tag as described above for the tt(tag-order)
 style.  On each call it checks to see if there are any more tag labels; if
 there is it returns status zero, otherwise non-zero.
 As this function requires a current tag to be set, it must always follow
@@ -3912,13 +3912,13 @@ return ret)
 )
 findex(_normal)
 item(tt(_normal))(
-This is the standard function called to handled completion outside
-nay special var(-context-).  It is called both to complete the command
+This is the standard function called to handle completion outside
+any special var(-context-).  It is called both to complete the command
 word and also the arguments for a command.  In the second case,
 tt(_normal) looks for a special completion for that command, and if
 there is none it uses the completion for the tt(-default-) context.
 
-A second use is to rexamine the command line specified by the tt($words)
+A second use is to reexamine the command line specified by the tt($words)
 array and the tt($CURRENT) parameter after those have been modified.
 For example, the function tt(_precommand), which
 completes after pre-command specifiers such as tt(nohup), removes the
@@ -4012,7 +4012,7 @@ findex(_pick_variant)
 item(tt(_pick_variant [ tt(-c) var(command) ] [ tt(-r) var(name) ] var(label)tt(=)var(pattern) ... var(label) [ var(args) ... ]))(
 This function is used to resolve situations where a single command name
 requires more than one type of handling, either because it
-has more than one variant because there is a name clash between two
+has more than one variant or because there is a name clash between two
 different commands.
 
 The command to run is taken from the first element of the array
@@ -4123,7 +4123,7 @@ done)
 
 Note that the test for whether matches were generated is not performed
 until the end of the tt(_tags) loop.  This is so that the user can set
-the tt(tag-order) style to specify a set of tags to be tested at the
+the tt(tag-order) style to specify a set of tags to be completed at the
 same time.
 
 If var(name) and var(descr) are given, tt(_requested) calls the
@@ -4179,7 +4179,7 @@ item(tt(_setup) var(tag) [ var(group) ])(
 This function sets up the special
 parameters used by the completion system appropriately for the var(tag)
 given as the first argument.  It uses the styles tt(list-colors),
-tt(list-packed), tt(list-rows-first), tt(last-promp), tt(accept-exact),
+tt(list-packed), tt(list-rows-first), tt(last-prompt), tt(accept-exact),
 tt(menu) and tt(force-list).
 
 The optional var(group) supplies the name of the group in which the
@@ -4193,7 +4193,7 @@ findex(_store_cache)
 item(tt(_store_cache) var(cache_identifier) var(params) ...)(
 This function, together with tt(_retrieve_cache) and
 tt(_cache_invalid), implements a caching layer which can be used
-in any completion functions.  Data obtained by
+in any completion function.  Data obtained by
 costly operations are stored in parameters;
 this function then dumps the values of those parameters to a file.  The
 data can then be retrieved quickly from that file via tt(_retrieve_cache),
@@ -4225,7 +4225,7 @@ valid for completions in the current context.  These tags are stored
 internally and sorted by using the tt(tag-order) style.
 
 Next, tt(_tags) is called repeatedly without arguments from the same
-comletion function.  This successively selects the first, second,
+completion function.  This successively selects the first, second,
 etc. set of tags requested by the user.  The return value is zero if at
 least one of the tags is requested and non-zero otherwise.  To test if a
 particular tag is to be tried, the tt(_requested) function should be
@@ -4239,7 +4239,7 @@ specific context without having to change and reset the
 tt(curcontext) parameter (which has the same effect).
 )
 findex(_values)
-item(tt(_values) [ -O var(name) ] [ -s var(sep) ] [ -S var(sep) ] [ -C ] var(desc) var(spec) ...)(
+item(tt(_values) [ tt(-O) var(name) ] [ tt(-s) var(sep) ] [ tt(-S) var(sep) ] [ tt(-wC) ] var(desc) var(spec) ...)(
 This is used to complete arbitrary keywords (values) and their arguments,
 or lists of such combinations.
 
@@ -4273,8 +4273,8 @@ beginning with an equal sign are not supported.
 
 The character separating a value from its argument can be set using the
 option tt(-S) (like tt(-s), followed by the character to use as the
-separator in the next argument).  By default the equal
-sign will be used to separator values and arguments.
+separator in the next argument).  By default the equals
+sign will be used as the separator between values and arguments.
 
 Example:
 
@@ -4341,9 +4341,8 @@ This function is useful in such a case.
 The arguments to tt(_wanted) are the same as those to tt(_requested),
 i.e. arguments to be passed to tt(_description).  However, in this case
 the var(command) is not optional;  all the processing of tags, including
-the loop over both tags and tags labels and the generation of matches,
-is carried out automatically by tt(_wanted).  This also means that
-tt(_wanted) should not be called inside a tt(_tags) loop.
+the loop over both tags and tag labels and the generation of matches,
+is carried out automatically by tt(_wanted).
 
 Hence to offer only one tag and immediately add the corresponding
 matches with the given description:
diff --git a/Doc/Zsh/mod_tcp.yo b/Doc/Zsh/mod_tcp.yo
index 2d37632fc..b710a447a 100644
--- a/Doc/Zsh/mod_tcp.yo
+++ b/Doc/Zsh/mod_tcp.yo
@@ -54,7 +54,7 @@ This is likely to be zero unless the connection is for listening.
 )
 item(The remote host)(
 This is the fully qualified domain name of the peer, if available, else an
-IP address.  It is an all-zero IP adress for a session opened for
+IP address.  It is an all-zero IP address for a session opened for
 listening.
 )
 item(The remote port)(
diff --git a/Doc/Zsh/mod_zselect.yo b/Doc/Zsh/mod_zselect.yo
index 506ef033c..9a120e5e3 100644
--- a/Doc/Zsh/mod_zselect.yo
+++ b/Doc/Zsh/mod_zselect.yo
@@ -19,7 +19,7 @@ shell builtin of the same name.
 Arguments and options may be intermingled in any order.  Non-option
 arguments are file descriptors, which must be decimal integers.  By
 default, file descriptors are to be tested for reading, i.e. tt(zselect)
-will return when data is availble to be read from the file descriptor, or
+will return when data is available to be read from the file descriptor, or
 more precisely, when a read operation from the file descriptor will not
 block.  After a tt(-r), tt(-w) and tt(-e), the given file descriptors are
 to be tested for reading, writing, or error conditions.  These options and
diff --git a/Doc/Zsh/tcpsys.yo b/Doc/Zsh/tcpsys.yo
index 82b80df11..2875b8981 100644
--- a/Doc/Zsh/tcpsys.yo
+++ b/Doc/Zsh/tcpsys.yo
@@ -285,8 +285,8 @@ handled and printed out according to the current settings.  Status 0 is
 always returned.
 
 This is generally only useful for interactive use, to prevent the display
-becomming fragmented by output returned from the connection.  Within a
-programe or function it is generally better to handle reading data by a
+becoming fragmented by output returned from the connection.  Within a
+programme or function it is generally better to handle reading data by a
 more explicit method.
 )
 findex(tcp_expect)
@@ -322,7 +322,7 @@ The function returns as soon as any one of the patterns given match.  If
 the caller needs to know which of the patterns matched, the option tt(-p)
 var(var) can be used; on return, tt($var) is set to the number of the
 pattern using ordinary zsh indexing, i.e. the first is 1, and so on.  Note
-tha absence of a `tt($)' in front of var(var).  To avoid clashes, the
+the absence of a `tt($)' in front of var(var).  To avoid clashes, the
 parameter cannot begin with `tt(_expect)'.
 
 The option tt(-q) is passed directly down to tt(tcp_read).
@@ -371,7 +371,7 @@ tt($tcp_spam_list) array or on the command line are spammed in the order
 given.  The tt(-r) flag reverses the order however it was arrived it.
 
 The tt(-v) flag specifies that a tt($TCP_PROMPT) will be output before each
-session.  This is output after any modfication to TCP_SESS by the
+session.  This is output after any modification to TCP_SESS by the
 user-defined tt(tcp_on_spam) function described below.  (Obviously that
 function is able to generate its own output.)
 )
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index 75d3faadf..705de2a03 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -425,7 +425,7 @@ produces output to the terminal, it should call `tt(zle -I)' before doing
 so (see below).  The handler should not attempt to read from the terminal.
 Note that zle makes no attempt to check whether this fd is actually
 readable when installing the handler.  The user must make their own
-arrangments for handling the file descriptor when zle is not active.
+arrangements for handling the file descriptor when zle is not active.
 
 Any number of handlers for any number of readable file descriptors may be
 installed.  Installing a handler for an var(fd) which is already handled
diff --git a/Doc/zshtcpsys.yo b/Doc/zshtcpsys.yo
index 52cd86153..bb247a348 100644
--- a/Doc/zshtcpsys.yo
+++ b/Doc/zshtcpsys.yo
@@ -1,3 +1,3 @@
 manpage(ZSHTCPSYS)(1)(date())(zsh version())
-manpagename(zshtcpsys)(zsh tcpletion system)
+manpagename(zshtcpsys)(zsh tcp system)
 includefile(Zsh/tcpsys.yo)

diff --git a/Functions/Misc/relative b/Functions/Misc/relative
index f649e51e7..432f2e2da 100644
--- a/Functions/Misc/relative
+++ b/Functions/Misc/relative
@@ -15,7 +15,7 @@ local -a cur abs
 cur=(${(s:/:)2})	# Split 'current' directory into cur
 abs=(${(s:/:)1} $3)	# Split target directory into abs
 
-# Compute the length of the common prefix, or discover a subdiretory:
+# Compute the length of the common prefix, or discover a subdirectory:
 integer i=1
 while [[ i -le $#abs && $abs[i] == $cur[i] ]]
 do
diff --git a/Functions/TCP/tcp_alias b/Functions/TCP/tcp_alias
index 9d6a28da0..59fe67814 100644
--- a/Functions/TCP/tcp_alias
+++ b/Functions/TCP/tcp_alias
@@ -85,7 +85,7 @@ for arg in $*; do
 	index=${array[(i)$alias]}
 	array=(${array[1,index-1]} ${array[index+1,-1]})
 	if [[ -z "$array" ]]; then
-	  unset "tcp_aliase[$fd]"
+	  unset "tcp_aliases[$fd]"
 	else
 	  tcp_aliases[$fd]="$array"
 	fi
diff --git a/Functions/TCP/tcp_close b/Functions/TCP/tcp_close
index 61508f4c6..9c876786c 100644
--- a/Functions/TCP/tcp_close
+++ b/Functions/TCP/tcp_close
@@ -4,7 +4,7 @@
 # -n means don't close a fake session's fd.
 # -q means quiet.
 #
-# Accepts the -s and -l arguments for consistenty with other functions,
+# Accepts the -s and -l arguments for consistency with other functions,
 # but there is no particular gain in using them
 emulate -L zsh
 setopt extendedglob cbases
diff --git a/Functions/TCP/tcp_read b/Functions/TCP/tcp_read
index 97da8bf21..d9aa47e0e 100644
--- a/Functions/TCP/tcp_read
+++ b/Functions/TCP/tcp_read
@@ -87,7 +87,7 @@ while getopts "abdl:qs:t:T:u:" opt; do
 	done
 	;;
 
-    # Don't print an error mesage if there is no TCP connection,
+    # Don't print an error message if there is no TCP connection,
     # just return 1.
     (q) quiet=1
 	;;
diff --git a/Functions/Zle/forward-word-match b/Functions/Zle/forward-word-match
index 65bed784d..2a4165c0c 100644
--- a/Functions/Zle/forward-word-match
+++ b/Functions/Zle/forward-word-match
@@ -18,7 +18,7 @@ while (( count-- )); do
     match-words-by-style
 
     # For some reason forward-word doesn't work like the other word
-    # word commnds; it skips whitespace only after any matched word
+    # commands; it skips whitespace only after any matched word
     # characters.
 
     if [[ -n $matched_words[4] ]]; then
diff --git a/Functions/Zle/match-words-by-style b/Functions/Zle/match-words-by-style
index 9dcc165a9..0ca51d4fd 100644
--- a/Functions/Zle/match-words-by-style
+++ b/Functions/Zle/match-words-by-style
@@ -10,7 +10,7 @@
 # For example
 #    foo bar  rod stick
 #            ^
-# with the cursor where indicated whill with typical settings produce the
+# with the cursor where indicated will with typical settings produce the
 # elements `foo ', `bar', ` ', ` ', `rod', ` ' and `stick'.
 #
 # The style word-style can be set to indicate what a word is.
@@ -26,7 +26,7 @@
 #		treated as `normal', but this should not be relied upon.)
 #  specified    Similar to normal, except that only the words given
 #               in the string (and not also alphanumeric characters)
-#               are to be considerd parts of words.
+#               are to be considered parts of words.
 #  unspecified  The negation of `specified': the characters given
 #               are those that aren't to be considered parts of a word.
 #               They should probably include white space.
@@ -38,7 +38,7 @@
 #   zstyle ':zle:transpose-words*' word-style normal
 #   zstyle ':zle:transpose-words*' word-chars ''
 # will force bash-style word recognition, i.e only alphanumeric characters
-# are considerd parts of a word.  It is up to the function which calls
+# are considered parts of a word.  It is up to the function which calls
 # match-words-by-style to set the context in the variable curcontext,
 # else a default context will be used (not recommended).
 #
diff --git a/Functions/Zle/transpose-words-match b/Functions/Zle/transpose-words-match
index 6fb60a01d..6e12c4fa1 100644
--- a/Functions/Zle/transpose-words-match
+++ b/Functions/Zle/transpose-words-match
@@ -1,5 +1,5 @@
 # Transpose words, matching the words using match-words-by-style, q.v.
-# The group of word characters preceeding the cursor (not necessarily
+# The group of word characters preceding the cursor (not necessarily
 # immediately) are transposed with the group of word characters following
 # the cursor (again, not necessarily immediately).
 #
diff --git a/Src/Modules/zselect.c b/Src/Modules/zselect.c
index 25954559b..91c4ee78f 100644
--- a/Src/Modules/zselect.c
+++ b/Src/Modules/zselect.c
@@ -233,7 +233,7 @@ bin_zselect(char *nam, char **args, Options ops, int func)
 			zaddlinknode(fdlist, ztrdup(buf));
 		    }
 		} else {
-		    /* List of fd's preceeded by -r, -w, -e. */
+		    /* List of fd's preceded by -r, -w, -e. */
 		    if (!doneit) {
 			buf[0] = '-';
 			buf[1] = fdchar[i];
diff --git a/Src/zsh.h b/Src/zsh.h
index aa2c11fe3..bcde57bb4 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -939,7 +939,7 @@ struct funcwrap {
  * Handling of options.
  *
  * Option strings are standard in that a trailing `:' indicates
- * a mandatory argument.  In addtion, `::' indicates an optional
+ * a mandatory argument.  In addition, `::' indicates an optional
  * argument which must immediately follow the option letter if it is present.
  * `:%' indicates an optional numeric argument which may follow
  * the option letter or be in the next word; the only test is
@@ -1014,7 +1014,7 @@ struct builtin {
 #define BINF_SKIPINVALID	(1<<12)	/* Treat invalid option as argument */
 #define BINF_KEEPNUM		(1<<13) /* `[-+]NUM' can be an option */
 #define BINF_SKIPDASH		(1<<14) /* Treat `-' as argument (maybe `+') */
-#define BINF_DASHDASHVALID	(1<<15) /* Handle `--' evenf if SKIPINVALD */
+#define BINF_DASHDASHVALID	(1<<15) /* Handle `--' even if SKIPINVALD */
 
 struct module {
     char *nam;
diff --git a/Test/B03print.ztst b/Test/B03print.ztst
index f2e12978c..9a22f2207 100644
--- a/Test/B03print.ztst
+++ b/Test/B03print.ztst
@@ -171,7 +171,7 @@
 >0003
 
  printf '%2$d%1$d\n' 1 2 3 4
-0:reuse format where arguments are explictly specified
+0:reuse format where arguments are explicitly specified
 >21
 >43
 
diff --git a/zshconfig.ac b/zshconfig.ac
index 6984478f3..01cc9a086 100644
--- a/zshconfig.ac
+++ b/zshconfig.ac
@@ -1224,7 +1224,7 @@ fi
 
 dnl On some systems the RLIMIT_* don't evaluate to integers at compile time
 dnl (they may be enums).  In this case we are not able to do preprocessor
-dnl comparisions and need our tests to determine what values exist and
+dnl comparisons and need our tests to determine what values exist and
 dnl if there are clashing definitions.
 
 zsh_LIMIT_PRESENT(RLIMIT_AIO_MEM)