summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.stephenson@samsung.com>2018-11-14 14:22:10 +0000
committerPeter Stephenson <p.stephenson@samsung.com>2018-11-14 14:22:10 +0000
commit7292c063e8fe38c9212bfb47880934effc052ae1 (patch)
treef2ed8df4e1b48255375273e398df32503db59014
parente25f890589dce079f595b4a53388fb6a0e3abb9e (diff)
downloadzsh-7292c063e8fe38c9212bfb47880934effc052ae1.tar.gz
zsh-7292c063e8fe38c9212bfb47880934effc052ae1.tar.xz
zsh-7292c063e8fe38c9212bfb47880934effc052ae1.zip
43620: More care documenting command substitution including $(<...)
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/expn.yo13
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 26068c16d..d07a9dff3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-14  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 43620: Doc/Zsh/expn.yo: more care documenting command
+	substituion including $(<...).
+
 2018-11-13  dana  <dana@dana.is>
 
 	* 43809: Completion/Unix/Command/_npm: Suppress npm update checks
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index c79109700..a212d742d 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1683,10 +1683,17 @@ any trailing newlines deleted.
 If the substitution is not enclosed in double quotes, the
 output is broken into words using the tt(IFS) parameter.
 vindex(IFS, use of)
+
 The substitution `tt($LPAR()cat) var(foo)tt(RPAR())' may be replaced
-by the equivalent but faster `tt($LPAR()<)var(foo)tt(RPAR())'.
-In either case, if the option tt(GLOB_SUBST) is set,
-the output is eligible for filename generation.
+by the faster `tt($LPAR()<)var(foo)tt(RPAR())'.  In this case var(foo)
+undergoes single word shell expansions (em(parameter expansion),
+em(command substitution) and em(arithmetic expansion)), but not
+filename generation.
+
+If the option tt(GLOB_SUBST) is set, the result of any unquoted command
+substitution, including the special form just mentioned, is eligible for
+filename generation.
+
 texinode(Arithmetic Expansion)(Brace Expansion)(Command Substitution)(Expansion)
 sect(Arithmetic Expansion)
 cindex(arithmetic expansion)