summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Doc/Zsh/expn.yo9
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f65215c4c..c1395f31c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
* 33116: Src/hist.c: followup to 32580 to prevent double-locking
with shared or incremental history
+ * unposted: Doc/Zsh/expn.yo: clarify ${(~j.|.)array} example
+
2014-08-21 Mikael Magnusson <mikachu@gmail.com>
* 33061: Completion/Zsh/Command/_setopt,
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index b4aa9c715..532672b10 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1126,13 +1126,14 @@ in string arguments to any of the flags described below that
follow this argument.
)
item(tt(~))(
-Force string arguments to any of the flags below that follow within
-the parentheses to be treated as patterns. Compare with a tt(~)
+Strings inserted into the expansion by any of the flags below are to
+be treated as patterns. This applies to the string arguments of flags
+that follow tt(~) within the same set of parentheses. Compare with tt(~)
outside parentheses, which forces the entire substituted string to
be treated as a pattern. Hence, for example,
example([[ "?" = ${(~j.|.)array} ]])
-with the tt(EXTENDED_GLOB) option set succeeds if and only if tt($array)
-contains the string `tt(?)' as an element. The argument may be
+treats `tt(|)' as a pattern and succeeds if and only if tt($array)
+contains the string `tt(?)' as an element. The tt(~) may be
repeated to toggle the behaviour; its effect only lasts to the
end of the parenthesised group.
)