6 files changed, 24 insertions, 25 deletions
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)