about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <danielsh@apache.org>2020-01-15 19:50:55 +0000
committerDaniel Shahaf <danielsh@apache.org>2020-01-16 18:18:17 +0000
commit0a7bfc0bd27e27829fb00cf4c8149a9fae98bb06 (patch)
treeebcabb3c61b66efe22c7fbac6a117651dc359640
parent6f263b5e8972f7858ed389c96211e3828f8ae13a (diff)
downloadzsh-0a7bfc0bd27e27829fb00cf4c8149a9fae98bb06.tar.gz
zsh-0a7bfc0bd27e27829fb00cf4c8149a9fae98bb06.tar.xz
zsh-0a7bfc0bd27e27829fb00cf4c8149a9fae98bb06.zip
45307: zstyle docs: Unoverload a placeholder variable name.
Use 'pattern' to refer to things matched against contexts and 'metapattern'
to refer to things matched against patterns.
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/mod_zutil.yo9
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a5c27f50e..7ffdfbcba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2020-01-16  Daniel Shahaf  <danielsh@apache.org>
 
+	* 45307: Doc/Zsh/mod_zutil.yo: zstyle docs: Unoverload a
+	placeholder variable name.
+
 	* 45306: Doc/Zsh/mod_zutil.yo: zstyle docs: Introduce the first
 	synopsis in the same way as all others: with an item()().
 
diff --git a/Doc/Zsh/mod_zutil.yo b/Doc/Zsh/mod_zutil.yo
index 5363037ab..24aebdfaf 100644
--- a/Doc/Zsh/mod_zutil.yo
+++ b/Doc/Zsh/mod_zutil.yo
@@ -7,7 +7,7 @@ The tt(zsh/zutil) module only adds some builtins:
 
 startitem()
 findex(zstyle)
-xitem(tt(zstyle) [ tt(-L) [ var(pattern) [ var(style) ] ] ])
+xitem(tt(zstyle) [ tt(-L) [ var(metapattern) [ var(style) ] ] ])
 xitem(tt(zstyle) [ tt(-e) | tt(-) | tt(-)tt(-) ] var(pattern) var(style) var(string) ...)
 xitem(tt(zstyle -d) [ var(pattern) [ var(style) ... ] ])
 xitem(tt(zstyle -g) var(name) [ var(pattern) [ var(style) ] ])
@@ -52,14 +52,15 @@ em(Usage)
 The forms that operate on patterns are the following.
 
 startitem()
-item(tt(zstyle) [ tt(-L) [ var(pattern) [ var(style) ] ] ])(
+item(tt(zstyle) [ tt(-L) [ var(metapattern) [ var(style) ] ] ])(
 Without arguments, lists style definitions.  Styles
 are shown in alphabetic order and patterns are shown in the order
 tt(zstyle) will test them.
 
 If the tt(-L) option is given, listing is done in the form of calls to
-tt(zstyle).  The optional first argument is a pattern which will be matched
-against the string supplied as the pattern for the context; note that
+tt(zstyle).  The optional first argument, var(metapattern), is a pattern which
+will be matched against the string supplied as var(pattern) when the style was
+defined.  Note:
 this means, for example, `tt(zstyle -L ":completion:*")' will
 match any supplied pattern beginning `tt(:completion:)', not
 just tt(":completion:*"):  use tt(':completion:\*') to match that.