From bf292bde144dd5f6832b6c1b619c5ebb5d404060 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 25 Feb 2017 22:52:19 +0000 Subject: 40641: docs: patterns: Add '|' to the overview. Clarify that it short-circuits. --- Doc/Zsh/expn.yo | 1 + Doc/Zsh/roadmap.yo | 3 +++ 2 files changed, 4 insertions(+) (limited to 'Doc') 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 -- cgit 1.4.1