summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-10-24 15:35:13 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-10-24 15:35:13 +0000
commitaba557a13cd1099ade8cd5c2bf7a109df3c6d77f (patch)
tree6931b839f7451a98f23891d0c88382690f821cb8
parente5f1efa5a23213fdeb64907fbb5fc8db37aa5e0a (diff)
downloadzsh-aba557a13cd1099ade8cd5c2bf7a109df3c6d77f.tar.gz
zsh-aba557a13cd1099ade8cd5c2bf7a109df3c6d77f.tar.xz
zsh-aba557a13cd1099ade8cd5c2bf7a109df3c6d77f.zip
Jérémie Roquet: c.f. users/16541:
should be "filename generation", not "file generation" in cond doc
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/cond.yo2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f20a43af..a5abb669e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-10-24  Peter Stephenson  <pws@csr.com>
 
+	* Jérémie Roquet: c.f. users/16541: Doc/Zsh/cond.yo:
+	should be "filename generation", not "file generation".
+
 	* Foudil Brétel: 29842: Completion/Unix/Command/_systemctl:
 	major rewrite.
 
@@ -15497,5 +15500,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5483 $
+* $Revision: 1.5484 $
 *****************************************************
diff --git a/Doc/Zsh/cond.yo b/Doc/Zsh/cond.yo
index 489ee356b..71971b4b3 100644
--- a/Doc/Zsh/cond.yo
+++ b/Doc/Zsh/cond.yo
@@ -184,7 +184,7 @@ 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.
-File generation is not performed on any form of argument to conditions.
+Filename 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(\