summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/expn.yo9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a5b998ab..29e5fd982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-20 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * 41433: Doc/Zsh/expn.yo: Further clarification about expansion
+ processing.
+
2017-07-17 Peter Stephenson <p.stephenson@samsung.com>
* 41429: Doc/Zsh/expn.yo: Better documentation of how stages of
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index c45f83a3e..a61738f84 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -21,9 +21,12 @@ xitem(em(Parameter Expansion))
xitem(em(Command Substitution))
xitem(em(Arithmetic Expansion))
item(em(Brace Expansion))(
-These five are performed in one step in left-to-right fashion. After
-these expansions, all unquoted occurrences of the characters `tt(\)',
-`tt(')' and `tt(")' are removed.
+These five are performed in left-to-right fashion. On each argument,
+any of the five steps that are needed are performed one after the other.
+Hence, for example, all the parts of parameter expansion are completed
+before command substitution is started. After these expansions, all
+unquoted occurrences of the characters `tt(\)',`tt(')' and `tt(")' are
+removed.
)
item(em(Filename Expansion))(
If the tt(SH_FILE_EXPANSION) option is set, the order of expansion is