zsh-3.1.6-pws-3 zsh-3.1.6-pws-3

3 files changed, 14 insertions, 29 deletions

diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 492128bfb..8f235710b 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -996,10 +996,10 @@ argument), options are considered to be one-character options and the
 strings from the line may contain more than one such option letter.
 
 The function can also be made to automatically complete long options
-for commands that support the `tt(-)tt(-help)' option as, for example,
-most of the GNU commands do. For this, the string `tt(-)tt(-)' must be
+for commands that support the `tt(--help)' option as, for example,
+most of the GNU commands do. For this, the string `tt(--)' must be
 given as one argument and if it is, the command from the line is
-invoked with the `tt(-)tt(-help)' option and its output is parsed to find
+invoked with the `tt(--help)' option and its output is parsed to find
 possible option names. Note that this means that you should be careful
 to make sure that this feature is not used for a command that does not
 support this option.
@@ -1007,13 +1007,13 @@ support this option.
 For options that get an argument after a `tt(=)', the function also tries
 to automatically find out what should be completed as the argument.
 The possible completions for option-arguments can be described with
-the arguments after the `tt(-)tt(-)' (which are not used as described
+the arguments after the `tt(--)' (which are not used as described
 above). Each argument contains one description of the form
 `var(pattern)tt(:)var(message)tt(:)var(action)'. The var(message) and
 the var(action) have the same format as for the normal option
 descriptions described above. The var(action) will be executed to
 complete arguments of options whose description in the output of the
-command from the line with the `tt(-)tt(-help)' option matches the
+command from the line with the `tt(--help)' option matches the
 var(pattern). For example:
 
 example(_arguments -- '*\*'     '(yes no)' \ 
@@ -1035,17 +1035,17 @@ detect this, the colon before the var(message) can be doubled to tell
 it about this as described for the normal option descriptions above.
 
 The option `tt(-i) var(patterns)' (which must be given after the
-`tt(-)tt(-)') can be used to give patterns for options which should not be
+`tt(--)') can be used to give patterns for options which should not be
 completed. The patterns can be given as the name of an array parameter
 or as a literal list in parentheses. E.g. `tt(-i
-"LPAR()-)tt(-(en|dis)able-FEATURE*RPAR()")' will make the options
-`tt(-)tt(-enable-FEATURE)' and `tt(-)tt(-disable-FEATURE)' be ignored. The
-option `tt(-s) var(pairs)' (again, after the `tt(-)tt(-)') can be used to
+"(--(en|dis)able-FEATURE*)")' will make the options
+`tt(--enable-FEATURE)' and `tt(--disable-FEATURE)' be ignored. The
+option `tt(-s) var(pairs)' (again, after the `tt(--)') can be used to
 describe option aliases. Each var(pair) consists of a pattern and a
 replacement. E.g. some tt(configure)-scripts describe options only as
-`tt(-)tt(-enable-foo)', but also accept `tt(disable-foo)'. To allow
-completion of the second form, one would use `tt(-s "LPAR()#-)tt(-enable-
--)tt(-disable-RPAR()")'.
+`tt(--enable-foo)', but also accept `tt(disable-foo)'. To allow
+completion of the second form, one would use `tt(-s "(#--enable-
+--disable-)")'.
 
 Finally, this function uses the configuration key tt(option_prefix). If
 it is set to a non-empty string, option names are added as possible
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index b548770a2..323ea7480 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -447,21 +447,6 @@ match for tt(t*e) is substituted and the result is `tt(spy star)',
 while in the second case, the shortest matches are taken and the
 result is `tt(spy spy lispy star)'.
 )
-xitem(tt(${)var(name)tt(^)var(pattern)tt(^)var(then)tt(^)var(else)tt(}))
-item(tt(${)var(name)tt(^^)var(pattern)tt(^)var(then)tt(^)var(else)tt(}))(
-If the expansion of var(name) matches the var(pattern), the var(then)
-string is substituted, otherwise the var(else) string is
-substituted. In the second form the var(pattern) is taken to be
-negated (even if the tt(EXTENDED_GLOB) option is not set). The
-var(else) string with the preceding `tt(^)' may be omitted in which
-case the expansion behaves as if var(name) were unset (or, if
-var(name) is an array, as if the element compared did not exist). In
-the var(pattern) and the var(then) string a `tt(^)' may be included by 
-preceding it with two backslashes. Finally, the var(then) and
-var(else) string may consist of only a dot to make it expand to the
-original string. To make them expand to only a dot, the string
-`tt(\.)' has to be used.
-)
 item(tt(${#)var(spec)tt(}))(
 If var(spec) is one of the above substitutions, substitute
 the length in characters of the result instead of
@@ -1113,7 +1098,7 @@ to have a `tt(/)' within a group (this only applies for patterns used in
 filename generation).  There is one exception:  a group of the form
 tt(LPAR())var(pat)tt(/RPAR()#) appearing as a complete path segment can
 match a sequence of directories.  For example, tt(foo/(a*/)#bar) matches
-tt(foo/bar), tt(foo/any/bar), tt(foo/any/anyother/bar), and so on).
+tt(foo/bar), tt(foo/any/bar), tt(foo/any/anyother/bar), and so on.
 )
 item(var(x)tt(|)var(y))(
 Matches either var(x) or var(y).
diff --git a/Doc/ztexi.yo b/Doc/ztexi.yo
index 96985539d..33535abc4 100644
--- a/Doc/ztexi.yo
+++ b/Doc/ztexi.yo
@@ -55,7 +55,7 @@ def(texinfo)(2)(\
   NOTRANS(@c %**end of header)NL()\
   NL()\
   NOTRANS(@ifinfo)NL()\
-  NOTRANS(@set dsq @'@')NL()\
+  NOTRANS(@set dsq '@:')NL()\
   NOTRANS(@end ifinfo)NL()\
   NOTRANS(@iftex)NL()\
   NOTRANS(@set dsq '{}')NL()\