about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHan Pingtian <hanpt@linux.vnet.ibm.com>2015-03-31 11:28:35 +0800
committerPeter Stephenson <pws@zsh.org>2015-04-01 09:31:48 +0100
commit5b2bb68364ba025b312168d12a0f43b38b4e6268 (patch)
treeabee8e2fb56245c402e21011036865e80c8a00f5
parent3ef734ca72b7886a26a06d6b90381110864a1d42 (diff)
downloadzsh-5b2bb68364ba025b312168d12a0f43b38b4e6268.tar.gz
zsh-5b2bb68364ba025b312168d12a0f43b38b4e6268.tar.xz
zsh-5b2bb68364ba025b312168d12a0f43b38b4e6268.zip
34822: correction to GLOB_SUBST doc
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/options.yo2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f597527a9..b506d9829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 	Completion/Unix/Type/_net_interfaces: improve matching of
 	devices already on command line in ip completion.
 
+2015-03-31  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* Han Pingtian: 34822: Doc/Zsh/options.yo: correction to
+	GLOB_SUBST doc.
+
 2015-03-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 34817: Src/hist.c, Src/lex.c: catch some errors earlier when
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index 359ecb94e..19920ca53 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -540,7 +540,7 @@ pindex(GLOBSUBST)
 pindex(NOGLOBSUBST)
 item(tt(GLOB_SUBST) <C> <K> <S>)(
 Treat any characters resulting from parameter expansion as being
-eligible for file expansion and filename generation, and any
+eligible for filename expansion and filename generation, and any
 characters resulting from command substitution as being eligible for
 filename generation.  Braces (and commas in between) do not become eligible
 for expansion.