summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/expn.yo5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0649b5fd7..4a5b998ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-17  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 41429: Doc/Zsh/expn.yo: Better documentation of how stages of
+	expansion fit together.
+
 2017-07-15  Oliver Kiddle  <opk@zsh.org>
 
 	* 41431: Completion/Linux/Command/_lsblk,
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index d161b0ba5..c45f83a3e 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -856,8 +856,9 @@ all arguments to be removed.
 Internally, each such expansion is converted into the
 equivalent list for brace expansion.  E.g., tt(${^var}) becomes
 tt({$var[1],$var[2],)...tt(}), and is processed as described in
-noderef(Brace Expansion) below.
-If word splitting is also in effect the
+noderef(Brace Expansion) below: note, however, the expansion
+happens immediately, with any explicit brace expansion
+happening later.  If word splitting is also in effect the
 tt($var[)var(N)tt(]) may themselves be split into different list
 elements.
 )