3 files changed, 24 insertions, 70 deletions
diff --git a/Doc/Zsh/.distfiles b/Doc/Zsh/.distfiles
index 4f521e91c..22fd53a29 100644
--- a/Doc/Zsh/.distfiles
+++ b/Doc/Zsh/.distfiles
@@ -1,73 +1,5 @@
 DISTFILES_SRC='
-.cvsignore
-.distfiles
-arith.yo
-builtins.yo
-calsys.yo
-compat.yo
-compctl.yo
-compsys.yo
-compwid.yo
-cond.yo
-contrib.yo
-exec.yo
-expn.yo
-filelist.yo
-files.yo
-ftp_sites.yo
-func.yo
-grammar.yo
-index.yo
-intro.yo
-invoke.yo
-jobs.yo
 manmodmenu.yo
-manual.yo
-metafaq.yo
-mod_attr.yo
-mod_cap.yo
-mod_clone.yo
-mod_compctl.yo
-mod_complete.yo
-mod_complist.yo
-mod_computil.yo
-mod_curses.yo
-mod_datetime.yo
-mod_deltochar.yo
-mod_example.yo
-mod_files.yo
-mod_langinfo.yo
 modlist.yo
-mod_mapfile.yo
-mod_mathfunc.yo
 modmenu.yo
-mod_newuser.yo
-mod_parameter.yo
-mod_pcre.yo
-mod_regex.yo
-mod_sched.yo
-mod_socket.yo
-mod_stat.yo
-mod_system.yo
-mod_tcp.yo
-mod_termcap.yo
-mod_terminfo.yo
-modules.yo
-mod_zftp.yo
-mod_zleparameter.yo
-mod_zle.yo
-mod_zprof.yo
-mod_zpty.yo
-mod_zselect.yo
-mod_zutil.yo
-options.yo
-params.yo
-prompt.yo
-redirect.yo
-restricted.yo
-roadmap.yo
-seealso.yo
-tcpsys.yo
-zftpsys.yo
-zle.yo
 '
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 8a9f47db1..920b5903d 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -4741,6 +4741,19 @@ This function accepts the tt(compadd) options `tt(-V)', `tt(-J)',
 `tt(-r)', `tt(-R)', and `tt(-q)' and passes them on to the tt(compadd)
 builtin used to add the matches.
 )
+findex(_sequence)
+item(tt(_sequence) [ tt(-s) var(sep) ] [ tt(-n) var(max) ] [ tt(-d) ] var(function) [ tt(-) ] ...)(
+This function is a wrapper to other functions for completing items in a
+separated list. The same function is used to complete each item in the
+list. The separator is specified with the tt(-s) option. If tt(-s) is
+omitted it will use `tt(,)'. Duplicate values are not matched unless
+tt(-d) is specified. If there is a fixed or maximum number of items in
+the list, this can be specified with the tt(-n) option.
+
+Common tt(compadd) options are passed on to the function. It is possible
+to use tt(compadd) directly with tt(_sequence), though tt(_values) may
+be more appropriate in this situation.
+)
 findex(_setup)
 item(tt(_setup) var(tag) [ var(group) ])(
 This function sets up the special
diff --git a/Doc/Zsh/tcpsys.yo b/Doc/Zsh/tcpsys.yo
index 1e26054ce..406785997 100644
--- a/Doc/Zsh/tcpsys.yo
+++ b/Doc/Zsh/tcpsys.yo
@@ -299,7 +299,7 @@ programme or function it is generally better to handle reading data by a
 more explicit method.
 )
 findex(tcp_expect)
-xitem(tt(tcp_expect [ -q ] [ -p) var(var) tt(] [ -t ) var(to) tt(| -T) var(TO)tt(]))
+xitem(tt(tcp_expect [ -q ] [ -p ) var(var) tt( | -P ) var(var) tt(] [ -t ) var(to) tt(| -T) var(TO)tt(]))
 item(tt(    [ -a | -s) var(sess) tt(... | -l) var(sess)tt(,... ]) var(pattern) ...)(
 Wait for input matching any of the given var(pattern)s from any of the
 specified sessions.  Input is ignored until an input line matches one of
@@ -332,7 +332,16 @@ 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
 the absence of a `tt($)' in front of var(var).  To avoid clashes, the
-parameter cannot begin with `tt(_expect)'.
+parameter cannot begin with `tt(_expect)'.  The index -1 is used if
+there is a timeout and 0 if there is no match.
+
+The option tt(-P) var(var) works similarly to tt(-p), but instead of
+numerical indexes the regular arguments must begin with a prefix
+followed by a colon: that prefix is then used as a tag to which var(var)
+is set when the argument matches.  The tag tt(timeout) is used if there
+is a timeout and the empty string if there is no match.  Note it is
+acceptable for different arguments to start with the same prefix if the
+matches do not need to be distinguished.
 
 The option tt(-q) is passed directly down to tt(tcp_read).