about summary refs log tree commit diff
path: root/Doc
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2017-09-14 21:43:37 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2017-09-14 21:43:37 +0100
commitab7be4238ca89b5dca482a1c3b3fd013b105750e (patch)
treed22e18887769a111c1e6597f6bd33dc136439e55 /Doc
parent7ca2e97c14cd7927c1ee688880884a2bd152fc68 (diff)
downloadzsh-ab7be4238ca89b5dca482a1c3b3fd013b105750e.tar.gz
zsh-ab7be4238ca89b5dca482a1c3b3fd013b105750e.tar.xz
zsh-ab7be4238ca89b5dca482a1c3b3fd013b105750e.zip
More [key]=value tweaks
Some rephrasings.

Update typeset -p for associative arrays to use new syntax.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/Zsh/expn.yo7
-rw-r--r--Doc/Zsh/params.yo9
2 files changed, 10 insertions, 6 deletions
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index a61738f84..d5e5838df 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1025,9 +1025,10 @@ ifnzman(noderef(Filename Expansion))\
 ifzman(the section FILENAME EXPANSION below).
 )
 item(tt(e))(
-Perform em(parameter expansion), em(command substitution) and
-em(arithmetic expansion) on the result. Such expansions can be
-nested but too deep recursion may have unpredictable effects.
+Perform single word shell expansions, namely em(parameter expansion),
+em(command substitution) and em(arithmetic expansion), on the
+result. Such expansions can be nested but too deep recursion may have
+unpredictable effects.
 )
 item(tt(f))(
 Split the result of the expansion at newlines. This is a shorthand
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 33e9fd69a..2534d1c72 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -102,13 +102,16 @@ may be in any order.  Note that this syntax is strict: tt([) and tt(]=) must
 not be quoted, while var(key) may not consist of the unquoted string
 tt(]=), but is otherwise treated as a simple string.  Furthermore, all
 elements must match this form or an error is generated; likewise, if the
-first entry does not match this form any later entry that does is taken
+first entry does not match this form, any later entry that does is taken
 as a simple value rather than a key / value pair. The enhanced forms of
 subscript expression that may be used when directly subscripting a
 variable name, described in the section Array Subscripts below, are not
 available.  Both var(key) and var(value) undergo all forms of expansion
-allowed for single word substitutions (this does not include filename
-generation).
+allowed for single word shell expansions (this does not include filename
+generation); these are as performed by the parameter expansion flag
+tt(LPAR()e+RPAR()) as described in
+ifzman(zmanref(zshparam))\
+ifnzman(nodref(Parameter Expansion)).
 
 If no parameter var(name) exists, an ordinary array parameter is created.
 If the parameter var(name) exists and is a scalar, it is replaced by a new