zsh-3.1.5-pws-5 zsh-3.1.5-pws-5

3 files changed, 38 insertions, 14 deletions

diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 2df70cd98..82562fcbe 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -947,9 +947,10 @@ otherwise it is determined by the width of the value of the
 first assignment.
 )
 item(tt(-a))(
-The names refer to array parameters.  For historical reasons, scalar
-parameters are created even when this flag is specified, but the
-output is restricted to arrays (including associative arrays).
+The names refer to array parameters.  An array parameter may be
+created this way, but it may not be assigned to in the tt(typeset)
+statement.  When displaying, both normal and associative arrays are
+shown.
 )
 item(tt(-f))(
 The names refer to functions rather than parameters.  No assignments
diff --git a/Doc/Zsh/compctl.yo b/Doc/Zsh/compctl.yo
index 37296b716..e9634a26f 100644
--- a/Doc/Zsh/compctl.yo
+++ b/Doc/Zsh/compctl.yo
@@ -85,7 +85,7 @@ the standard behavior for all commands.  For example, if your access
 to the user database is too slow and/or it contains too many users (so
 that completion after `tt(~)' is too slow to be usable), you can use
 
-nofill(tt(compctl -Tx  'C[0,*/*]' -f - 's[~]' -k friends -S/))
+nofill(tt(compctl -Tx  'C[0,*/*]' -f - 's[~]' -k friends -S/ -tn))
 
 to complete the strings in the array tt(friends) after a `tt(~)'.
 The first argument is necessary so that this form of ~-completion is
@@ -432,16 +432,18 @@ the sorted ones. I.e. it is possible to have a sorted and a unsorted group
 with the same name and the matches in those groups will not be mixed.
 )
 item(tt(-t) var(continue))(
-The var(continue)-string contains a set of characters that specify if 
-and when completion should continue to produce matches where it normally
-would not do that. The character tt(c) means that completion continues
-with the next suitable compctl (i.e. if you don't specify this in a
-tt(compctl -T), compctls for commands are never used). The character
-tt(PLUS()) is used to continue with the matches for the next alternative
-completion (see below). The characters tt(-) and tt(x) may be used in
-sub-lists for extended completion (see below). They will make the completion
-code use the flag list after the next tt(-) (if the corresponding pattern
-matches) and the default flag list (those before the tt(-x)), respectively.
+The var(continue)-string contains a character that specifies which set 
+of completion flags should be used next. Normally those of the next
+matching compctl are used, i.e. pattern compctls and normal compctls
+after tt(-T) and after a pattern compctl. If var(continue) is the
+character tt(PLUS()) the flags for the next alternative completion
+(see below) are used. The characters tt(-) and tt(x) can be used in
+sub-lists for extended completion (see below). They will make the
+completion code use the flag list after the next tt(-) (if the
+corresponding pattern matches) and the default flag list (those before
+the tt(-x)), respectively. if var(continue) is the character tt(n) no
+other flag lists are used, i.e. the generation of matches stops
+immediately.
 )
 item(tt(-M) var(match-spec))(
 This defines additional matching control specifications that should be used
diff --git a/Doc/Zsh/mod_zftp.yo b/Doc/Zsh/mod_zftp.yo
index a15be60d6..c08130bf5 100644
--- a/Doc/Zsh/mod_zftp.yo
+++ b/Doc/Zsh/mod_zftp.yo
@@ -92,6 +92,27 @@ nofill(tt(LPAR()zftp open; zftp get foo >bar; zftp close)tt(RPAR() &))
 --- here, the connection is restricted to a background subshell and
 you are free to open a simultaneous connection in the foreground.
 )
+item(tt(test))(
+Test the connection; if the server has reported
+that it has closed the connection (maybe due to a timeout), return
+status 2; if no connection was open anyway, return status 1; else
+return status 0.  The tt(test) subcommand is
+silent, apart from messages printed by the tt($ZFTP_VERBOSE)
+mechanism, or error messages if the connection closes.  There is no
+network overhead for this test.
+
+The test is only supported on systems with either the tt(select(2)) or
+tt(poll(2)) system calls; otherwise the message tt(not
+supported on this system) is printed instead.
+
+It is useful to put the code
+
+nofill(tt([[ -n $ZFTP_HOST ]] && zftp test))
+
+into the shell function tt(precmd) for testing the connection before
+every prompt.  However, tt(zftp) will call tt(test) at the start of any
+other subcommand when a connection is open.
+)
 item(tt(cd) var(directory))(
 Change the remote directory to var(directory).  Also alters the shell
 variable tt(ZFTP_PWD).