diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-25 22:52:19 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-28 07:39:15 +0000 |
| commit | bf292bde144dd5f6832b6c1b619c5ebb5d404060 (patch) | |
| tree | 5637e5b4b79f2653bc99526056a5c9b227596b2e | |
| parent | d00931de5c2b7aa846daf137865dd05ac8d4be8a (diff) | |
| download | zsh-bf292bde144dd5f6832b6c1b619c5ebb5d404060.tar.gz zsh-bf292bde144dd5f6832b6c1b619c5ebb5d404060.zip | |
40641: docs: patterns: Add '|' to the overview. Clarify that it short-circuits.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Zsh/expn.yo | 1 | ||||
| -rw-r--r-- | Doc/Zsh/roadmap.yo | 3 |
3 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2017-02-28 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 40641: Doc/Zsh/expn.yo, Doc/Zsh/roadmap.yo: docs: patterns: + Add '|' to the overview. Clarify that it short-circuits. + 2017-02-26 Barton E. Schaefer <schaefer@zsh.org> * 40650: Src/Modules/parameter.c: redo 40508 and 40626 with diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo index 016d8aef0..e049aa540 100644 --- a/Doc/Zsh/expn.yo +++ b/Doc/Zsh/expn.yo @@ -2110,6 +2110,7 @@ Matches either var(x) or var(y). This operator has lower precedence than any other. The `tt(|)' character must be within parentheses, to avoid interpretation as a pipeline. +The alternatives are tried in order from left to right. ) item(tt(^)var(x))( (Requires tt(EXTENDED_GLOB) to be set.) diff --git a/Doc/Zsh/roadmap.yo b/Doc/Zsh/roadmap.yo index bd064e2b2..94ef74d1f 100644 --- a/Doc/Zsh/roadmap.yo +++ b/Doc/Zsh/roadmap.yo @@ -139,6 +139,9 @@ startitem() item(tt(**))( for matching over multiple directories ) +item(tt(|))( +for matching either of two alternatives +) item(tt(~), tt(^))( the ability to exclude patterns from matching when the tt(EXTENDED_GLOB) option is set |