about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Zsh/cond.yo7
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b322ecd0..4df71cc6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  Peter Stephenson  <pws@csr.com>
+
+	* users/14891: Doc/Zsh/cond.yo: say explicitly that condition
+	arguments don't undergo file generation.
+
 2010-02-25  Peter Stephenson  <pws@csr.com>
 
 	* 27755: Doc/Zsh/mod_system.yo, Src/Modules/system.c:
@@ -12824,5 +12829,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4915 $
+* $Revision: 1.4916 $
 *****************************************************
diff --git a/Doc/Zsh/cond.yo b/Doc/Zsh/cond.yo
index 0613dca05..489ee356b 100644
--- a/Doc/Zsh/cond.yo
+++ b/Doc/Zsh/cond.yo
@@ -183,9 +183,10 @@ enditem()
 
 Normal shell expansion is performed on the var(file), var(string) and
 var(pattern) arguments, but the result of each expansion is constrained to
-be a single word, similar to the effect of double quotes.  However, pattern
-metacharacters are active for the var(pattern) arguments; the patterns
-are the same as those used for filename generation, see
+be a single word, similar to the effect of double quotes.
+File generation is not performed on any form of argument to conditions.
+However, pattern metacharacters are active for the var(pattern) arguments;
+the patterns are the same as those used for filename generation, see
 ifzman(\
 zmanref(zshexpn)\
 )\